pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

spktoolbar: Fix compilation under Laz <1.8

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5980 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-07-08 11:59:47 +00:00
parent d2f7f2f376
commit 3b2bc7db66
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/spktoolbar/demos/actions/unit1.lfm
View File

@ -9,7 +9,7 @@ object Form1: TForm1
Menu = MainMenu Menu = MainMenu
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '1.7' LCLVersion = '1.6.4.0'
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 26 Height = 26
@ -128,8 +128,6 @@ object Form1: TForm1
Top = 26 Top = 26
Width = 585 Width = 585
Appearance.Tab.TabHeaderFont.Color = 9126421 Appearance.Tab.TabHeaderFont.Color = 9126421
Appearance.Tab.TabHeaderFont.Height = -13
Appearance.Tab.TabHeaderFont.Name = 'Calibri'
Appearance.Tab.BorderColor = 14922381 Appearance.Tab.BorderColor = 14922381
Appearance.Tab.GradientFromColor = 16115934 Appearance.Tab.GradientFromColor = 16115934
Appearance.Tab.GradientToColor = 15587527 Appearance.Tab.GradientToColor = 15587527
@ -139,14 +137,10 @@ object Form1: TForm1
Appearance.Pane.BorderLightColor = 16315117 Appearance.Pane.BorderLightColor = 16315117
Appearance.Pane.CaptionBgColor = 15849922 Appearance.Pane.CaptionBgColor = 15849922
Appearance.Pane.CaptionFont.Color = 11168318 Appearance.Pane.CaptionFont.Color = 11168318
Appearance.Pane.CaptionFont.Height = -12
Appearance.Pane.CaptionFont.Name = 'Calibri'
Appearance.Pane.GradientFromColor = 16115934 Appearance.Pane.GradientFromColor = 16115934
Appearance.Pane.GradientToColor = 15587527 Appearance.Pane.GradientToColor = 15587527
Appearance.Pane.GradientType = bkConcave Appearance.Pane.GradientType = bkConcave
Appearance.Element.CaptionFont.Color = 9126421 Appearance.Element.CaptionFont.Color = 9126421
Appearance.Element.CaptionFont.Height = -12
Appearance.Element.CaptionFont.Name = 'Calibri'
Appearance.Element.IdleFrameColor = 14727067 Appearance.Element.IdleFrameColor = 14727067
Appearance.Element.IdleGradientFromColor = 15653832 Appearance.Element.IdleGradientFromColor = 15653832
Appearance.Element.IdleGradientToColor = 15323324 Appearance.Element.IdleGradientToColor = 15323324

BIN
components/spktoolbar/demos/basic/Project1.res
View File

Binary file not shown.

4
components/spktoolbar/designtime/spkte_AppearanceEditor.pas
View File

@ -1373,11 +1373,11 @@ var
w, h: Integer; w, h: Integer;
begin begin
// Use correct size of color picker icon // Use correct size of color picker icon
if Monitor.PixelsPerInch >= 180 then begin if ScreenInfo.PixelsPerInchY >= 180 then begin
imglist := Images_200; imglist := Images_200;
m := 2.0; m := 2.0;
end end
else if Monitor.PixelsPerInch >= 135 then begin else if ScreenInfo.PixelsPerInchY >= 135 then begin
imglist := Images_150; imglist := Images_150;
m := 1.5; m := 1.5;
end end

6
components/spktoolbar/designtime/spkte_EditWindow.pas
View File

@ -1158,12 +1158,12 @@ end;
procedure TfrmEditWindow.UpdatePPI; procedure TfrmEditWindow.UpdatePPI;
begin begin
tbToolbar.Images := nil; tbToolbar.Images := nil;
if Monitor.PixelsPerInch >= 180 then begin if ScreenInfo.PixelsPerInchY >= 180 then begin
ActionList.Images := ilActionImages_200; ActionList.Images := ilActionImages_200;
tbToolbar.Images := ilActionImages_200; tbToolbar.Images := ilActionImages_200;
tvStructure.Images := ilTreeImages_200; tvStructure.Images := ilTreeImages_200;
end else end else
if Monitor.PixelsPerInch >= 135 then begin if ScreenInfo.PixelsPerInchY >= 135 then begin
ActionList.Images := ilActionImages_150; ActionList.Images := ilActionImages_150;
tbToolbar.Images := ilActionImages_150; tbToolbar.Images := ilActionImages_150;
tvStructure.Images := ilTreeImages_150; tvStructure.Images := ilTreeImages_150;
@ -1172,7 +1172,7 @@ begin
tbToolbar.Images := ilActionImages; tbToolbar.Images := ilActionImages;
tvStructure.Images := ilTreeImages; tvStructure.Images := ilTreeImages;
end; end;
// tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8; tbToolbar.ButtonHeight := tbToolbar.Images.Height + 8;
// tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8; // tbToolbar.ButtonWidth := tbToolbar.Images.Width + 8;
end; end;