Fixed TSpTBXPageScroller to support High DPI.

Added vclimg and vclwinx dependencies to the package.
SilverpointDev · Dec 24, 2020 · edd538f · edd538f
1 parent b86f89b
commit edd538f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Packages/RAD Studio/SpTBXLib.dpk b/Packages/RAD Studio/SpTBXLib.dpk
@@ -30,7 +30,9 @@ requires
   vcl,
   tb2k_d12,
   rtl,
-  vclx;
+  vclx,
+  vclimg,
+  vclwinx;
 
 contains
   SpTBXItem in '..\..\Source\SpTBXItem.pas',

diff --git a/Packages/RAD Studio/SpTBXLib.dproj b/Packages/RAD Studio/SpTBXLib.dproj
@@ -86,6 +86,8 @@
         <DCCReference Include="tb2k_d12.dcp"/>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vclx.dcp"/>
+        <DCCReference Include="vclimg.dcp"/>
+        <DCCReference Include="vclwinx.dcp"/>
         <DCCReference Include="..\..\Source\SpTBXItem.pas"/>
         <DCCReference Include="..\..\Source\SpTBXControls.pas"/>
         <DCCReference Include="..\..\Source\SpTBXTabs.pas"/>

diff --git a/Source/SpTBXPageScroller.pas b/Source/SpTBXPageScroller.pas
@@ -193,7 +193,7 @@   TSpTBXPageScroller = class(TSpTBXCustomPageScroller)
   end;
 
 { Painting helpers }
-procedure SpTBXPaintPageScrollButton(ACanvas: TCanvas; const ARect: TRect; ButtonType: TSpTBXPageScrollerButtonType; Hot: Boolean);
+procedure SpTBXPaintPageScrollButton(ACanvas: TCanvas; const ARect: TRect; ButtonType: TSpTBXPageScrollerButtonType; Hot: Boolean; DPI: Integer);
 
 implementation
 
@@ -228,7 +228,7 @@ function GetMinControlWidth(Control: TControl): Integer;
 end;
 
 procedure SpTBXPaintPageScrollButton(ACanvas: TCanvas; const ARect: TRect;
-  ButtonType: TSpTBXPageScrollerButtonType; Hot: Boolean);
+  ButtonType: TSpTBXPageScrollerButtonType; Hot: Boolean; DPI: Integer);
 var
   R: TRect;
   Flags: Integer;
@@ -257,12 +257,12 @@ procedure SpTBXPaintPageScrollButton(ACanvas: TCanvas; const ARect: TRect;
         else
           Details := SpTBXThemeServices.GetElementDetails(tbPushButtonNormal);
 
-        CurrentSkin.PaintThemedElementBackground(ACanvas, ARect, Details);
+        CurrentSkin.PaintThemedElementBackground(ACanvas, ARect, Details, DPI);
         CurrentSkin.GetThemedElementTextColor(Details, C);
       end;
     sknSkin:
       begin
-        SpDrawXPButton(ACanvas, R, True, False, Hot, False, False, False);
+        SpDrawXPButton(ACanvas, R, True, False, Hot, False, False, False, DPI);
         if Hot then
           C := CurrentSkin.GetTextColor(skncButton, sknsHotTrack)
         else
@@ -563,14 +563,14 @@ procedure TSpTBXCustomPageScroller.DrawNCArea(const DrawToDC: Boolean;
         BR := R;
         if Orientation = tpsoVertical then BR.Bottom := BR.Top + ButtonSize
         else BR.Right := BR.Left + ButtonSize;
-        SpTBXPaintPageScrollButton(ACanvas, BR, CBtns[Orientation, False], FScrollDirection < 0);
+        SpTBXPaintPageScrollButton(ACanvas, BR, CBtns[Orientation, False], FScrollDirection < 0, CurrentPPI);
       end;
       if tpsbNext in FVisibleButtons then
       begin
         BR := R;
         if Orientation = tpsoVertical then BR.Top := BR.Bottom - ButtonSize
         else BR.Left := BR.Right - ButtonSize;
-        SpTBXPaintPageScrollButton(ACanvas, BR, CBtns[Orientation, True], FScrollDirection > 0);
+        SpTBXPaintPageScrollButton(ACanvas, BR, CBtns[Orientation, True], FScrollDirection > 0, CurrentPPI);
       end;
       ACanvas.Brush.Color := clBlue;
       ACanvas.Pen.Color := clBlue;