paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spktoolbar: Rename constant DPI_AWARE to SPK_DPI_AWARE (to distinguish from LCL scaling). Remove global DesignDPI variable.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6192 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2018-02-09 17:19:18 +00:00
parent b1dfb45d3a
commit 856716b59f
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/spktoolbar/SpkToolbar/SpkToolbar.pas
View File

@ -548,16 +548,9 @@ begin
//todo: not found in lcl //todo: not found in lcl
//inherited AlignWithMargins:=true; //inherited AlignWithMargins:=true;
if AOwner is TForm then if (AOwner is TForm) then
{$IF LCL_FullVersion >= 1090000} SpkInitLayoutConsts(96); // This default dpi value is ignored for LCL scaling
DesignDPI := TForm(AOwner).DesignTimePPI
{$ELSE}
DesignDPI := TForm(AOwner).DesignTimeDPI
{$ENDIF}
else
DesignDPI := ScreenInfo.PixelsPerInchX;
SpkInitLayoutConsts(DesignDPI);
inherited Height := ToolbarHeight; inherited Height := ToolbarHeight;
//inherited Doublebuffered:=true; //inherited Doublebuffered:=true;

13
components/spktoolbar/SpkToolbar/spkt_Buttons.pas
View File

@ -436,21 +436,16 @@ begin
ActionChange(Sender, False); ActionChange(Sender, False);
end; end;
{ Draw a downward-facing filled triangle as dropdown arrow }
procedure TSpkBaseButton.DrawDropdownArrow(ABuffer: TBitmap; ARect: TRect; procedure TSpkBaseButton.DrawDropdownArrow(ABuffer: TBitmap; ARect: TRect;
AColor: TColor); AColor: TColor);
const
w = 8;
h = 8;
var var
P: array[0..3] of TPoint; P: array[0..3] of TPoint;
wsc, hsc: Integer;
begin begin
wsc := ScaleX(w, DesignDPI); // 0 1
hsc := ScaleY(h, DesignDPI); // 2
P[2].x := ARect.Left + (ARect.Right - ARect.Left) div 2; P[2].x := ARect.Left + (ARect.Right - ARect.Left) div 2;
P[2].y := ARect.Top + (ARect.Bottom - ARect.Top + hsc) div 2 - 1; P[2].y := ARect.Top + (ARect.Bottom - ARect.Top + DropDownArrowHeight) div 2 - 1;
P[0] := Point(P[2].x - wsc div 2, P[2].y - hsc div 2); P[0] := Point(P[2].x - DropDownArrowWidth div 2, P[2].y - DropDownArrowHeight div 2);
P[1] := Point(P[2].x + wsc div 2, P[0].y); P[1] := Point(P[2].x + DropDownArrowWidth div 2, P[0].y);
P[3] := P[0]; P[3] := P[0];
ABuffer.Canvas.Brush.Color := AColor; ABuffer.Canvas.Brush.Color := AColor;
ABuffer.Canvas.Pen.Style := psClear; ABuffer.Canvas.Pen.Style := psClear;

22
components/spktoolbar/SpkToolbar/spkt_Const.pas
View File

@ -19,14 +19,11 @@ uses
const const
{$IF lcl_fullversion < 1080000} {$IF lcl_fullversion < 1080000}
DPI_AWARE = true; SPK_DPI_AWARE = true;
{$ELSE} {$ELSE}
DPI_AWARE = false; // use lcl scaling instead SPK_DPI_AWARE = false; // use lcl scaling instead
{$ENDIF} {$ENDIF}
var
DesignDPI: Integer;
procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0); procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0);
function SpkScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer; function SpkScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
function SpkScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer; function SpkScaleY(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer;
@ -53,6 +50,9 @@ const
SMALLBUTTON_DROPDOWN_WIDTH = 11; SMALLBUTTON_DROPDOWN_WIDTH = 11;
SMALLBUTTON_RADIUS = 4; SMALLBUTTON_RADIUS = 4;
DROPDOWN_ARROW_WIDTH = 8;
DROPDOWN_ARROW_HEIGHT = 8;
// *********************** // ***********************
// *** Tab page layout *** // *** Tab page layout ***
// *********************** // ***********************
@ -166,6 +166,9 @@ var
SmallButtonRadius: Integer; SmallButtonRadius: Integer;
SmallButtonMinWidth: Integer; SmallButtonMinWidth: Integer;
DropdownArrowWidth: Integer;
DropdownArrowHeight: Integer;
// *********************** // ***********************
// *** Tab page layout *** // *** Tab page layout ***
@ -275,7 +278,7 @@ uses
procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0); procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0);
begin begin
if not DPI_AWARE then if not SPK_DPI_AWARE then
ToDPI := FromDPI; ToDPI := FromDPI;
{$IfDef Darwin} {$IfDef Darwin}
@ -300,6 +303,9 @@ begin
SmallButtonRadius := SMALLBUTTON_RADIUS; SmallButtonRadius := SMALLBUTTON_RADIUS;
SmallButtonMinWidth := 2 * SmallButtonPadding + SmallButtonGlyphWidth; SmallButtonMinWidth := 2 * SmallButtonPadding + SmallButtonGlyphWidth;
DropdownArrowWidth := SpkScaleX(DROPDOWN_ARROW_WIDTH, FromDPI, ToDPI);
DropdownArrowHeight := SpkScaleY(DROPDOWN_ARROW_HEIGHT, FromDPI, ToDPI);
MaxElementHeight := SpkScaleY(MAX_ELEMENT_HEIGHT, FromDPI, ToDPI); MaxElementHeight := SpkScaleY(MAX_ELEMENT_HEIGHT, FromDPI, ToDPI);
PaneRowHeight := SpkScaleY(PANE_ROW_HEIGHT, FromDPI, ToDPI); PaneRowHeight := SpkScaleY(PANE_ROW_HEIGHT, FromDPI, ToDPI);
PaneFullRowHeight := 3 * PaneRowHeight; PaneFullRowHeight := 3 * PaneRowHeight;
@ -363,7 +369,7 @@ begin
if ToDPI = 0 then if ToDPI = 0 then
ToDPI := ScreenInfo.PixelsPerInchX; ToDPI := ScreenInfo.PixelsPerInchX;
if (not DPI_AWARE) or (ToDPI = FromDPI) then if (not SPK_DPI_AWARE) or (ToDPI = FromDPI) then
Result := Size Result := Size
else else
begin begin
@ -380,7 +386,7 @@ begin
if ToDPI = 0 then if ToDPI = 0 then
ToDPI := ScreenInfo.PixelsPerInchY; ToDPI := ScreenInfo.PixelsPerInchY;
if (not DPI_AWARE) or (ToDPI = FromDPI) then if (not SPK_DPI_AWARE) or (ToDPI = FromDPI) then
Result := Size Result := Size
else else
begin begin