retina scaling

bgracolortheme.pas

@@ -32,11 +32,11 @@ type
 
   public
     procedure DrawButton(Caption: string; State: TBGRAThemeButtonState;
-      Focused: boolean; ARect: TRect; DestCanvas: TCanvas); override;
+      Focused: boolean; ARect: TRect; DestCanvas: TCanvas; {%H-}CanvasScale: single); override;
     procedure DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
-      {%H-}Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas); override;
+      {%H-}Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single); override;
     procedure DrawCheckBox(Caption: string; State: TBGRAThemeButtonState;
-      {%H-}Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas); override;
+      {%H-}Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single); override;
   published
     property ColorNormal: TColor read FColorNormal write SetFColorNormal;
     property ColorHover: TColor read FColorHover write SetFColorHover;
@@ -100,7 +100,7 @@ begin
 end;
 
 procedure TBGRAColorTheme.DrawButton(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
 begin
@@ -136,7 +136,7 @@ end;
 
 procedure TBGRAColorTheme.DrawRadioButton(Caption: string;
   State: TBGRAThemeButtonState; Focused: boolean; Checked: boolean;
-  ARect: TRect; DestCanvas: TCanvas);
+  ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -155,7 +155,7 @@ begin
     Color := ColorNormal;
   end;
 
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale), round(ARect.Height*CanvasScale));
   Bitmap.FillEllipseAntialias(Bitmap.Height / 2, Bitmap.Height / 2,
     Bitmap.Height / 2 - 2, Bitmap.Height / 2 - 2, BGRAWhite);
   Bitmap.EllipseAntialias(Bitmap.Height / 2, Bitmap.Height / 2,
@@ -163,7 +163,8 @@ begin
   if Checked then
     Bitmap.FillEllipseAntialias(Bitmap.Height / 2, Bitmap.Height /
       2, Bitmap.Height / 4, Bitmap.Height / 4, Color);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
 
   if Caption <> '' then
@@ -181,7 +182,7 @@ end;
 
 procedure TBGRAColorTheme.DrawCheckBox(Caption: string;
   State: TBGRAThemeButtonState; Focused: boolean; Checked: boolean;
-  ARect: TRect; DestCanvas: TCanvas);
+  ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -201,7 +202,7 @@ begin
     Color := ColorNormal;
   end;
 
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale), round(ARect.Height*CanvasScale));
   Bitmap.Rectangle(0, 0, Bitmap.Height, Bitmap.Height, Color, BGRAWhite);
   aleft := 0;
   aright := Bitmap.Height;
@@ -213,7 +214,8 @@ begin
       BezierCurve(PointF((aleft + aright - 1) / 2, abottom - 3), PointF(
       (aleft + aright - 1) / 2, (atop * 2 + abottom - 1) / 3), PointF(aright - 2, atop - 2))]),
       Color, 1.5);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
 
   if Caption <> '' then

bgraimagetheme.pas

@@ -25,7 +25,7 @@ type
     destructor Destroy; override;
     procedure LoadResources(AFileName: string);
     procedure DrawButton(Caption: string; State: TBGRAThemeButtonState;
-      {%H-}Focused: boolean; ARect: TRect; DestCanvas: TCanvas); override;
+      {%H-}Focused: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single); override;
   published
     property BackgroundColor: TColor read FBackgroundColor
       write SetFBackgroundColor default clForm;
@@ -68,7 +68,7 @@ begin
 end;
 
 procedure TBGRAImageTheme.DrawButton(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   ImageIndex: integer;
@@ -82,7 +82,7 @@ begin
     ImageIndex := 0;
   end;
 
-  bmp := TBGRABitmap.Create(ARect.Width, ARect.Height, BackgroundColor);
+  bmp := TBGRABitmap.Create(round(ARect.Width*CanvasScale), round(ARect.Height*CanvasScale), BackgroundColor);
 
   if Assigned(FSliceScalingButton) then
     FSliceScalingButton.Draw(ImageIndex, bmp, 0, 0, bmp.Width, bmp.Height);

bgrasvgtheme.pas

@@ -38,10 +38,10 @@ type
     destructor Destroy; override;
     procedure DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
     {%H-}Focused: boolean; Checked: boolean; ARect: TRect;
-      DestCanvas: TCanvas); override;
+      DestCanvas: TCanvas; CanvasScale: single); override;
     procedure DrawCheckBox(Caption: string; State: TBGRAThemeButtonState;
     {%H-}Focused: boolean; Checked: boolean; ARect: TRect;
-      DestCanvas: TCanvas); override;
+      DestCanvas: TCanvas; CanvasScale: single); override;
   public
     property ColorizeNormal: TBGRAPixel read FColorizeNormal write SetColorizeNormal;
     property ColorizeHover: TBGRAPixel read FColorizeHover write SetColorizeHover;
@@ -144,7 +144,7 @@ end;
 
 procedure TBGRASVGTheme.DrawRadioButton(Caption: string;
   State: TBGRAThemeButtonState; Focused: boolean; Checked: boolean;
-  ARect: TRect; DestCanvas: TCanvas);
+  ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -156,7 +156,7 @@ begin
     svg := TBGRASVG.CreateFromString(FRadioButtonChecked)
   else
     svg := TBGRASVG.CreateFromString(FRadioButtonUnchecked);
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale), round(ARect.Height*CanvasScale));
   aleft := 0;
   aright := Bitmap.Height;
   atop := 0;
@@ -170,7 +170,8 @@ begin
   end;
   if color{%H-} <> BGRAPixelTransparent then
     Colorize(Bitmap, Bitmap, color);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
   svg.Free;
 
@@ -195,7 +196,7 @@ begin
 end;
 
 procedure TBGRASVGTheme.DrawCheckBox(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -207,7 +208,7 @@ begin
     svg := TBGRASVG.CreateFromString(FCheckBoxChecked)
   else
     svg := TBGRASVG.CreateFromString(FCheckBoxUnchecked);
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale), round(ARect.Height*CanvasScale));
   aleft := 0;
   aright := Bitmap.Height;
   atop := 0;
@@ -221,7 +222,8 @@ begin
   end;
   if color{%H-} <> BGRAPixelTransparent then
     Colorize(Bitmap, Bitmap, color);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
   svg.Free;
 

bgratheme.pas

@@ -21,13 +21,13 @@ type
 
   public
     procedure DrawButton(Caption: string; State: TBGRAThemeButtonState;
-      Focused: boolean; ARect: TRect; DestCanvas: TCanvas); virtual;
+      Focused: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single); virtual;
     procedure DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
     {%H-}Focused: boolean; Checked: boolean; ARect: TRect;
-      DestCanvas: TCanvas); virtual;
+      DestCanvas: TCanvas; CanvasScale: single); virtual;
     procedure DrawCheckBox(Caption: string; State: TBGRAThemeButtonState;
     {%H-}Focused: boolean; Checked: boolean; ARect: TRect;
-      DestCanvas: TCanvas); virtual;
+      DestCanvas: TCanvas; CanvasScale: single); virtual;
   public
     procedure Colorize(Source, Dest: TBGRABitmap; c: TBGRAPixel);
   published
@@ -73,7 +73,7 @@ begin
 end;
 
 procedure TBGRATheme.DrawButton(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
 begin
@@ -107,7 +107,7 @@ begin
 end;
 
 procedure TBGRATheme.DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -126,7 +126,8 @@ begin
       Color := BGRABlack;
   end;
 
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale),
+            round(ARect.Height));
   Bitmap.FillEllipseAntialias(Bitmap.Height / 2, Bitmap.Height / 2,
     Bitmap.Height / 2 - 2, Bitmap.Height / 2 - 2, BGRAWhite);
   Bitmap.EllipseAntialias(Bitmap.Height / 2, Bitmap.Height / 2,
@@ -134,7 +135,8 @@ begin
   if Checked then
     Bitmap.FillEllipseAntialias(Bitmap.Height / 2, Bitmap.Height /
       2, Bitmap.Height / 4, Bitmap.Height / 4, Color);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
 
   if Caption <> '' then
@@ -151,7 +153,7 @@ begin
 end;
 
 procedure TBGRATheme.DrawCheckBox(Caption: string; State: TBGRAThemeButtonState;
-  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas);
+  Focused: boolean; Checked: boolean; ARect: TRect; DestCanvas: TCanvas; CanvasScale: single);
 var
   Style: TTextStyle;
   Bitmap: TBGRABitmap;
@@ -171,7 +173,7 @@ begin
       Color := BGRABlack;
   end;
 
-  Bitmap := TBGRABitmap.Create(ARect.Height, ARect.Height);
+  Bitmap := TBGRABitmap.Create(round(ARect.Height*CanvasScale), round(ARect.Height*CanvasScale));
   Bitmap.Rectangle(0, 0, Bitmap.Height, Bitmap.Height, Color, BGRAWhite);
   aleft := 0;
   aright := Bitmap.Height;
@@ -183,7 +185,8 @@ begin
       BezierCurve(PointF((aleft + aright - 1) / 2, abottom - 3), PointF(
       (aleft + aright - 1) / 2, (atop * 2 + abottom - 1) / 3), PointF(aright - 2, atop - 2))]),
       Color, 1.5);
-  Bitmap.Draw(DestCanvas, Arect.Left, Arect.Top, False);
+  Bitmap.Draw(DestCanvas, RectWithSize(Arect.Left, Arect.Top,
+    round(Bitmap.Width/CanvasScale), round(Bitmap.Height/CanvasScale)), False);
   Bitmap.Free;
 
   if Caption <> '' then

bgrathemebutton.pas

@@ -122,9 +122,9 @@ end;
 procedure TBGRAThemeButton.Paint;
 begin
   if Assigned(Theme) then
-    Theme.DrawButton(Caption, FState, Focused, ClientRect, Canvas)
+    Theme.DrawButton(Caption, FState, Focused, ClientRect, Canvas, GetCanvasScaleFactor)
   else
-    BGRADefaultTheme.DrawButton(Caption, FState, Focused, ClientRect, Canvas);
+    BGRADefaultTheme.DrawButton(Caption, FState, Focused, ClientRect, Canvas, GetCanvasScaleFactor);
 end;
 
 constructor TBGRAThemeButton.Create(AOwner: TComponent);

bgrathemecheckbox.pas

@@ -139,10 +139,10 @@ end;
 procedure TBGRAThemeCheckBox.Paint;
 begin
   if Assigned(Theme) then
-    Theme.DrawCheckBox(Caption, FState, Focused, Checked, ClientRect, Canvas)
+    Theme.DrawCheckBox(Caption, FState, Focused, Checked, ClientRect, Canvas, GetCanvasScaleFactor)
   else
     BGRADefaultTheme.DrawCheckBox(Caption, FState, Focused, Checked,
-      ClientRect, Canvas);
+      ClientRect, Canvas, GetCanvasScaleFactor);
 end;
 
 constructor TBGRAThemeCheckBox.Create(AOwner: TComponent);

bgrathemeradiobutton.pas

@@ -139,10 +139,10 @@ end;
 procedure TBGRAThemeRadioButton.Paint;
 begin
   if Assigned(Theme) then
-    Theme.DrawRadioButton(Caption, FState, Focused, Checked, ClientRect, Canvas)
+    Theme.DrawRadioButton(Caption, FState, Focused, Checked, ClientRect, Canvas, GetCanvasScaleFactor)
   else
     BGRADefaultTheme.DrawRadioButton(Caption, FState, Focused, Checked,
-      ClientRect, Canvas);
+      ClientRect, Canvas, GetCanvasScaleFactor);
 end;
 
 procedure TBGRAThemeRadioButton.UncheckOthers;