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

spktoolbar: LCLScaling support for property Appearance.Tab.CaptionHeight

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7196 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-11-22 21:44:38 +00:00
parent 10994ea2c9
commit 79a817cefd
5 changed files with 121 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1933,6 +1933,8 @@ begin
if ToolbarCornerRadius > 1 then if ToolbarCornerRadius > 1 then
ToolbarCornerRadius := round(ToolbarCornerRadius * AXProportion); ToolbarCornerRadius := round(ToolbarCornerRadius * AXProportion);
Appearance.Tab.AutoAdjustLayout(AXProportion, AYProportion);
end; end;
{$IF lcl_fullversion < 1080100} {$IF lcl_fullversion < 1080100}

26
components/spktoolbar/SpkToolbar/spkt_Appearance.pas
View File

@@ -15,7 +15,7 @@ unit spkt_Appearance;
interface interface
uses uses
Graphics, Classes, Forms, SysUtils, Graphics, Classes, Forms, SysUtils, LCLVersion,
SpkGUITools, SpkXMLParser, SpkXMLTools, SpkGUITools, SpkXMLParser, SpkXMLTools,
spkt_Dispatch, spkt_Exceptions; spkt_Dispatch, spkt_Exceptions;
@@ -47,7 +47,9 @@ type
FInactiveHeaderFontColor: TColor; FInactiveHeaderFontColor: TColor;
FCornerRadius: Integer; FCornerRadius: Integer;
FCaptionHeight: Integer; FCaptionHeight: Integer;
// Getter & setter methods // Getter & setter methods
function IsCaptionHeightStored: Boolean;
procedure SetHeaderFont(const Value: TFont); procedure SetHeaderFont(const Value: TFont);
procedure SetBorderColor(const Value: TColor); procedure SetBorderColor(const Value: TColor);
procedure SetCaptionHeight(const Value: Integer); procedure SetCaptionHeight(const Value: Integer);
@@ -73,10 +75,14 @@ type
procedure SaveToXML(Node: TSpkXMLNode); procedure SaveToXML(Node: TSpkXMLNode);
procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue);
{$IF lcl_fullversion >= 1080000}
procedure AutoAdjustLayout(const AXProportion, AYProportion: Double);
{$IFEND}
published published
property TabHeaderFont: TFont read FTabHeaderFont write SetHeaderFont; property TabHeaderFont: TFont read FTabHeaderFont write SetHeaderFont;
property BorderColor: TColor read FBorderColor write SetBorderColor; property BorderColor: TColor read FBorderColor write SetBorderColor;
property CaptionHeight: Integer read FCaptionHeight write SetCaptionHeight default -1; property CaptionHeight: Integer read FCaptionHeight write SetCaptionHeight stored IsCaptionHeightStored;
property CornerRadius: Integer read FCornerRadius write SetCornerRadius; property CornerRadius: Integer read FCornerRadius write SetCornerRadius;
property GradientFromColor: TColor read FGradientFromColor write SetGradientFromColor; property GradientFromColor: TColor read FGradientFromColor write SetGradientFromColor;
property GradientToColor: TColor read FGradientToColor write SetGradientToColor; property GradientToColor: TColor read FGradientToColor write SetGradientToColor;
@@ -308,7 +314,7 @@ constructor TSpkTabAppearance.Create(ADispatch: TSpkBaseAppearanceDispatch);
begin begin
inherited Create; inherited Create;
FDispatch := ADispatch; FDispatch := ADispatch;
FCaptionHeight := -1; FCaptionHeight := TOOLBAR_TAB_CAPTIONS_HEIGHT;
FCornerRadius := 0; FCornerRadius := 0;
FTabHeaderFont := TFont.Create; FTabHeaderFont := TFont.Create;
FTabHeaderFont.OnChange := TabHeaderFontChange; FTabHeaderFont.OnChange := TabHeaderFontChange;
@@ -359,6 +365,20 @@ begin
Result := FCaptionHeight; Result := FCaptionHeight;
end; end;
{$IF lcl_fullversion >= 1080000}
procedure TSpkTabAppearance.AutoAdjustLayout(
const AXProportion, AYProportion: Double);
begin
if IsCaptionHeightStored then
FCaptionHeight := round(FCaptionHeight * AYProportion);
end;
{$IFEND}
function TSpkTabAppearance.IsCaptionHeightStored: Boolean;
begin
Result := FCaptionHeight <> TOOLBAR_TAB_CAPTIONS_HEIGHT;
end;
procedure TSpkTabAppearance.LoadFromXML(Node: TSpkXMLNode); procedure TSpkTabAppearance.LoadFromXML(Node: TSpkXMLNode);
var var
Subnode: TSpkXMLNode; Subnode: TSpkXMLNode;

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

@@ -133,8 +133,8 @@ const
/// <summary>Pane padding?</summary> /// <summary>Pane padding?</summary>
TOOLBAR_BORDER_WIDTH = 1; TOOLBAR_BORDER_WIDTH = 1;
TOOLBAR_CORNER_RADIUS = 0; //was: 3; TOOLBAR_CORNER_RADIUS = 0; //was: 3;
/// <summary>Tab caption height</summary> /// <summary>Tab caption height: -1 = automatic</summary>
// TOOLBAR_TAB_CAPTIONS_HEIGHT = 22; TOOLBAR_TAB_CAPTIONS_HEIGHT = -1; // was: 22;
/// <summary>Tab caption horizontal padding</summary> /// <summary>Tab caption horizontal padding</summary>
TOOLBAR_TAB_CAPTIONS_TEXT_HPADDING = 4; TOOLBAR_TAB_CAPTIONS_TEXT_HPADDING = 4;
/// <summary>Min tab caption width</summary> /// <summary>Min tab caption width</summary>

132
components/spktoolbar/designtime/spkte_AppearanceEditor.lfm
View File

@@ -35,6 +35,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Appearance.Tab.TabHeaderFont.Height = -13 Appearance.Tab.TabHeaderFont.Height = -13
Appearance.Tab.TabHeaderFont.Name = 'Calibri' Appearance.Tab.TabHeaderFont.Name = 'Calibri'
Appearance.Tab.BorderColor = 14922381 Appearance.Tab.BorderColor = 14922381
Appearance.Tab.CornerRadius = 4
Appearance.Tab.GradientFromColor = 16115934 Appearance.Tab.GradientFromColor = 16115934
Appearance.Tab.GradientToColor = 15587527 Appearance.Tab.GradientToColor = 15587527
Appearance.Tab.GradientType = bkConcave Appearance.Tab.GradientType = bkConcave
@@ -86,6 +87,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
CustomAppearance.Tab.TabHeaderFont.Height = -13 CustomAppearance.Tab.TabHeaderFont.Height = -13
CustomAppearance.Tab.TabHeaderFont.Name = 'Calibri' CustomAppearance.Tab.TabHeaderFont.Name = 'Calibri'
CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.BorderColor = 14922381
CustomAppearance.Tab.CornerRadius = 4
CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientFromColor = 16115934
CustomAppearance.Tab.GradientToColor = 15587527 CustomAppearance.Tab.GradientToColor = 15587527
CustomAppearance.Tab.GradientType = bkConcave CustomAppearance.Tab.GradientType = bkConcave
@@ -224,6 +226,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
CustomAppearance.Tab.TabHeaderFont.Height = -13 CustomAppearance.Tab.TabHeaderFont.Height = -13
CustomAppearance.Tab.TabHeaderFont.Name = 'Calibri' CustomAppearance.Tab.TabHeaderFont.Name = 'Calibri'
CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.BorderColor = 14922381
CustomAppearance.Tab.CornerRadius = 4
CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientFromColor = 16115934
CustomAppearance.Tab.GradientToColor = 15587527 CustomAppearance.Tab.GradientToColor = 15587527
CustomAppearance.Tab.GradientType = bkConcave CustomAppearance.Tab.GradientType = bkConcave
@@ -376,7 +379,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 0 TabOrder = 1
OnClick = pTabFrameClick OnClick = pTabFrameClick
end end
object pTabGradientFrom: TPanel object pTabGradientFrom: TPanel
@@ -394,7 +397,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 1 TabOrder = 2
OnClick = pTabGradientFromClick OnClick = pTabGradientFromClick
end end
object pTabGradientTo: TPanel object pTabGradientTo: TPanel
@@ -412,7 +415,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 2 TabOrder = 3
OnClick = pTabGradientToClick OnClick = pTabGradientToClick
end end
object cbTabGradientKind: TComboBox object cbTabGradientKind: TComboBox
@@ -437,7 +440,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbTabGradientKindChange OnChange = cbTabGradientKindChange
Style = csDropDownList Style = csDropDownList
TabOrder = 3 TabOrder = 4
Text = 'None' Text = 'None'
end end
object pTabHeaderFont: TPanel object pTabHeaderFont: TPanel
@@ -455,7 +458,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Font' Caption = 'Font'
TabOrder = 4 TabOrder = 7
OnClick = pTabHeaderFontClick OnClick = pTabHeaderFontClick
end end
object pActiveTabHeaderFont: TPanel object pActiveTabHeaderFont: TPanel
@@ -488,7 +491,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'Link with pane and idle item' Caption = 'Link with pane and idle item'
OnClick = cbLinkTabClick OnClick = cbLinkTabClick
TabOrder = 6 TabOrder = 0
end end
object Label18: TLabel object Label18: TLabel
AnchorSideTop.Control = pActiveTabHeaderFont AnchorSideTop.Control = pActiveTabHeaderFont
@@ -532,7 +535,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Caption = 'Color' Caption = 'Color'
Color = clBtnFace Color = clBtnFace
ParentColor = False ParentColor = False
TabOrder = 7 TabOrder = 6
OnClick = pInactiveTabHeaderFontClick OnClick = pInactiveTabHeaderFontClick
end end
object bTabFrameColor: TSpeedButton object bTabFrameColor: TSpeedButton
@@ -668,6 +671,33 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Caption = 'Tab corner radius' Caption = 'Tab corner radius'
ParentColor = False ParentColor = False
end end
object lblTabCaptionHeight: TLabel
AnchorSideTop.Control = edTabCaptionHeight
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = lblTabHeaderFont
AnchorSideRight.Side = asrBottom
Left = 73
Height = 15
Top = 294
Width = 98
Anchors = [akTop, akRight]
Caption = 'Tab caption height'
ParentColor = False
end
object edTabCaptionHeight: TSpinEdit
AnchorSideLeft.Control = pTabHeaderFont
AnchorSideTop.Control = lblTabCornerRadius
AnchorSideTop.Side = asrBottom
Left = 191
Height = 23
Top = 290
Width = 82
BorderSpacing.Top = 10
MaxValue = 999
MinValue = -1
OnChange = edTabCaptionHeightChange
TabOrder = 9
end
end end
object TabSheet2: TTabSheet object TabSheet2: TTabSheet
Caption = 'Pane' Caption = 'Pane'
@@ -794,7 +824,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 0 TabOrder = 1
OnClick = pPaneBorderDarkClick OnClick = pPaneBorderDarkClick
end end
object pPaneBorderLight: TPanel object pPaneBorderLight: TPanel
@@ -812,7 +842,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 1 TabOrder = 2
OnClick = pPaneBorderLightClick OnClick = pPaneBorderLightClick
end end
object pPaneGradientFrom: TPanel object pPaneGradientFrom: TPanel
@@ -830,7 +860,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 2 TabOrder = 3
OnClick = pPaneGradientFromClick OnClick = pPaneGradientFromClick
end end
object pPaneGradientTo: TPanel object pPaneGradientTo: TPanel
@@ -848,7 +878,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 3 TabOrder = 4
OnClick = pPaneGradientToClick OnClick = pPaneGradientToClick
end end
object cbPaneGradientKind: TComboBox object cbPaneGradientKind: TComboBox
@@ -873,7 +903,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbPaneGradientKindChange OnChange = cbPaneGradientKindChange
Style = csDropDownList Style = csDropDownList
TabOrder = 4 TabOrder = 5
Text = 'None' Text = 'None'
end end
object pPaneCaptionBackground: TPanel object pPaneCaptionBackground: TPanel
@@ -891,7 +921,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 5 TabOrder = 6
OnClick = pPaneCaptionBackgroundClick OnClick = pPaneCaptionBackgroundClick
end end
object pPaneCaptionFont: TPanel object pPaneCaptionFont: TPanel
@@ -909,7 +939,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Font' Caption = 'Font'
TabOrder = 6 TabOrder = 9
OnClick = pPaneCaptionFontClick OnClick = pPaneCaptionFontClick
end end
object pPaneCaptionFontColor: TPanel object pPaneCaptionFontColor: TPanel
@@ -927,7 +957,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 7 TabOrder = 8
OnClick = pPaneCaptionFontColorClick OnClick = pPaneCaptionFontColorClick
end end
object cbLinkPane: TCheckBox object cbLinkPane: TCheckBox
@@ -942,7 +972,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'Link with tab and idle item' Caption = 'Link with tab and idle item'
OnClick = cbLinkPaneClick OnClick = cbLinkPaneClick
TabOrder = 8 TabOrder = 0
end end
object cbPaneStyle: TComboBox object cbPaneStyle: TComboBox
AnchorSideLeft.Control = pPaneCaptionFont AnchorSideLeft.Control = pPaneCaptionFont
@@ -969,7 +999,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbPaneStyleChange OnChange = cbPaneStyleChange
Style = csDropDownList Style = csDropDownList
TabOrder = 9 TabOrder = 10
Text = 'Rectangle etched' Text = 'Rectangle etched'
end end
object Label12: TLabel object Label12: TLabel
@@ -1141,7 +1171,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Top = 6 BorderSpacing.Top = 6
MinValue = -100 MinValue = -100
OnChange = edPaneHotTrackBrightnessChangeChange OnChange = edPaneHotTrackBrightnessChangeChange
TabOrder = 10 TabOrder = 7
end end
object Label16: TLabel object Label16: TLabel
AnchorSideLeft.Control = edPaneHotTrackBrightnessChange AnchorSideLeft.Control = edPaneHotTrackBrightnessChange
@@ -1343,7 +1373,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Font' Caption = 'Font'
TabOrder = 0 TabOrder = 22
OnClick = pItemFontClick OnClick = pItemFontClick
end end
object cbItemIdleGradientKind: TComboBox object cbItemIdleGradientKind: TComboBox
@@ -1368,7 +1398,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbItemIdleGradientKindChange OnChange = cbItemIdleGradientKindChange
Style = csDropDownList Style = csDropDownList
TabOrder = 1 TabOrder = 10
Text = 'None' Text = 'None'
end end
object pItemIdleGradientTo: TPanel object pItemIdleGradientTo: TPanel
@@ -1386,7 +1416,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 2 TabOrder = 7
OnClick = pItemIdleGradientToClick OnClick = pItemIdleGradientToClick
end end
object pItemIdleGradientFrom: TPanel object pItemIdleGradientFrom: TPanel
@@ -1404,7 +1434,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 3 TabOrder = 4
OnClick = pItemIdleGradientFromClick OnClick = pItemIdleGradientFromClick
end end
object pItemIdleFrame: TPanel object pItemIdleFrame: TPanel
@@ -1419,7 +1449,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 4 TabOrder = 1
OnClick = pItemIdleFrameClick OnClick = pItemIdleFrameClick
end end
object pItemIdleCaptionColor: TPanel object pItemIdleCaptionColor: TPanel
@@ -1437,7 +1467,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 5 TabOrder = 13
OnClick = pItemIdleCaptionColorClick OnClick = pItemIdleCaptionColorClick
end end
object pItemIdleInnerDark: TPanel object pItemIdleInnerDark: TPanel
@@ -1455,7 +1485,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 6 TabOrder = 16
OnClick = pItemIdleInnerDarkClick OnClick = pItemIdleInnerDarkClick
end end
object pItemIdleInnerLight: TPanel object pItemIdleInnerLight: TPanel
@@ -1473,7 +1503,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 7 TabOrder = 19
OnClick = pItemIdleInnerLightClick OnClick = pItemIdleInnerLightClick
end end
object cbItemHottrackGradientKind: TComboBox object cbItemHottrackGradientKind: TComboBox
@@ -1498,7 +1528,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbItemHottrackGradientKindChange OnChange = cbItemHottrackGradientKindChange
Style = csDropDownList Style = csDropDownList
TabOrder = 8 TabOrder = 11
Text = 'None' Text = 'None'
end end
object pItemHottrackGradientTo: TPanel object pItemHottrackGradientTo: TPanel
@@ -1518,7 +1548,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 9 TabOrder = 8
OnClick = pItemHottrackGradientToClick OnClick = pItemHottrackGradientToClick
end end
object pItemHottrackGradientFrom: TPanel object pItemHottrackGradientFrom: TPanel
@@ -1538,7 +1568,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 10 TabOrder = 5
OnClick = pItemHottrackGradientFromClick OnClick = pItemHottrackGradientFromClick
end end
object pItemHottrackFrame: TPanel object pItemHottrackFrame: TPanel
@@ -1556,7 +1586,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 11 TabOrder = 2
OnClick = pItemHottrackFrameClick OnClick = pItemHottrackFrameClick
end end
object pItemHottrackCaptionColor: TPanel object pItemHottrackCaptionColor: TPanel
@@ -1576,7 +1606,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 12 TabOrder = 14
OnClick = pItemHottrackCaptionColorClick OnClick = pItemHottrackCaptionColorClick
end end
object pItemHottrackInnerDark: TPanel object pItemHottrackInnerDark: TPanel
@@ -1596,7 +1626,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 13 TabOrder = 17
OnClick = pItemHottrackInnerDarkClick OnClick = pItemHottrackInnerDarkClick
end end
object pItemHottrackInnerLight: TPanel object pItemHottrackInnerLight: TPanel
@@ -1616,7 +1646,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 14 TabOrder = 20
OnClick = pItemHottrackInnerLightClick OnClick = pItemHottrackInnerLightClick
end end
object cbItemActiveGradientKind: TComboBox object cbItemActiveGradientKind: TComboBox
@@ -1641,7 +1671,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
) )
OnChange = cbItemActiveGradientKindChange OnChange = cbItemActiveGradientKindChange
Style = csDropDownList Style = csDropDownList
TabOrder = 15 TabOrder = 12
Text = 'None' Text = 'None'
end end
object pItemActiveGradientTo: TPanel object pItemActiveGradientTo: TPanel
@@ -1661,7 +1691,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 16 TabOrder = 9
OnClick = pItemActiveGradientToClick OnClick = pItemActiveGradientToClick
end end
object pItemActiveGradientFrom: TPanel object pItemActiveGradientFrom: TPanel
@@ -1681,7 +1711,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 17 TabOrder = 6
OnClick = pItemActiveGradientFromClick OnClick = pItemActiveGradientFromClick
end end
object pItemActiveFrame: TPanel object pItemActiveFrame: TPanel
@@ -1699,7 +1729,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 18 TabOrder = 3
OnClick = pItemActiveFrameClick OnClick = pItemActiveFrameClick
end end
object pItemActiveCaptionColor: TPanel object pItemActiveCaptionColor: TPanel
@@ -1719,7 +1749,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 19 TabOrder = 15
OnClick = pItemActiveCaptionColorClick OnClick = pItemActiveCaptionColorClick
end end
object pItemActiveInnerDark: TPanel object pItemActiveInnerDark: TPanel
@@ -1739,7 +1769,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BevelInner = bvRaised BevelInner = bvRaised
BevelOuter = bvLowered BevelOuter = bvLowered
Caption = 'Color' Caption = 'Color'
TabOrder = 20 TabOrder = 18
OnClick = pItemActiveInnerDarkClick OnClick = pItemActiveInnerDarkClick
end end
object pItemActiveInnerLight: TPanel object pItemActiveInnerLight: TPanel
@@ -1774,7 +1804,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'Link with tab and pane' Caption = 'Link with tab and pane'
OnClick = cbLinkItemClick OnClick = cbLinkItemClick
TabOrder = 22 TabOrder = 0
end end
object bItemIdleFrameColor: TSpeedButton object bItemIdleFrameColor: TSpeedButton
AnchorSideLeft.Control = pItemIdleFrame AnchorSideLeft.Control = pItemIdleFrame
@@ -2191,14 +2221,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
end end
object TabSheet4: TTabSheet object TabSheet4: TTabSheet
Caption = 'Import / export' Caption = 'Import / export'
ClientHeight = 355 ClientHeight = 354
ClientWidth = 544 ClientWidth = 544
ImageIndex = 3 ImageIndex = 3
object bImport: TButton object bImport: TButton
AnchorSideLeft.Control = bExportToXML AnchorSideLeft.Control = bExportToXML
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TabSheet4 AnchorSideTop.Control = TabSheet4
Left = 250 Left = 252
Height = 25 Height = 25
Top = 4 Top = 4
Width = 118 Width = 118
@@ -2207,16 +2237,16 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'Import from XML' Caption = 'Import from XML'
OnClick = bImportClick OnClick = bImportClick
TabOrder = 0 TabOrder = 2
end end
object bExportToXML: TButton object bExportToXML: TButton
AnchorSideLeft.Control = bExportToPascal AnchorSideLeft.Control = bExportToPascal
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TabSheet4 AnchorSideTop.Control = TabSheet4
Left = 146 Left = 147
Height = 25 Height = 25
Top = 4 Top = 4
Width = 100 Width = 101
AutoSize = True AutoSize = True
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 4 BorderSpacing.Top = 4
@@ -2233,7 +2263,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
AnchorSideBottom.Control = TabSheet4 AnchorSideBottom.Control = TabSheet4
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 4 Left = 4
Height = 318 Height = 317
Top = 33 Top = 33
Width = 536 Width = 536
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@@ -2246,7 +2276,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Font.Name = 'Courier New' Font.Name = 'Courier New'
ParentFont = False ParentFont = False
ScrollBars = ssAutoBoth ScrollBars = ssAutoBoth
TabOrder = 2 TabOrder = 4
end end
object bExportToPascal: TButton object bExportToPascal: TButton
AnchorSideLeft.Control = TabSheet4 AnchorSideLeft.Control = TabSheet4
@@ -2254,13 +2284,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Left = 4 Left = 4
Height = 25 Height = 25
Top = 4 Top = 4
Width = 138 Width = 139
AutoSize = True AutoSize = True
BorderSpacing.Left = 4 BorderSpacing.Left = 4
BorderSpacing.Top = 4 BorderSpacing.Top = 4
Caption = 'Export to Pascal code' Caption = 'Export to Pascal code'
OnClick = bExportToPascalClick OnClick = bExportToPascalClick
TabOrder = 3 TabOrder = 0
end end
object bCopyToClipboard: TButton object bCopyToClipboard: TButton
AnchorSideTop.Control = TabSheet4 AnchorSideTop.Control = TabSheet4
@@ -2276,12 +2306,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
BorderSpacing.Right = 4 BorderSpacing.Right = 4
Caption = 'Copy' Caption = 'Copy'
OnClick = bCopyToClipboardClick OnClick = bCopyToClipboardClick
TabOrder = 4 TabOrder = 3
end end
end end
object TabSheet5: TTabSheet object TabSheet5: TTabSheet
Caption = 'Tools' Caption = 'Tools'
ClientHeight = 357 ClientHeight = 354
ClientWidth = 544 ClientWidth = 544
ImageIndex = 4 ImageIndex = 4
object Label17: TLabel object Label17: TLabel

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

@@ -15,7 +15,9 @@ type
{ TfrmAppearanceEditWindow } { TfrmAppearanceEditWindow }
TfrmAppearanceEditWindow = class(TForm) TfrmAppearanceEditWindow = class(TForm)
edTabCaptionHeight: TSpinEdit;
lblTabCornerRadius: TLabel; lblTabCornerRadius: TLabel;
lblTabCaptionHeight: TLabel;
SmallImages: TImageList; SmallImages: TImageList;
LargeImages: TImageList; LargeImages: TImageList;
Images_150: TImageList; Images_150: TImageList;
@@ -174,6 +176,8 @@ type
Label17: TLabel; Label17: TLabel;
LbAppearanceStyle: TListbox; LbAppearanceStyle: TListbox;
procedure bActiveTabHeaderFontColorClick(Sender: TObject);
procedure bCopyToClipboardClick(Sender: TObject);
procedure bExportToPascalClick(Sender: TObject); procedure bExportToPascalClick(Sender: TObject);
procedure bExportToXMLClick(Sender: TObject); procedure bExportToXMLClick(Sender: TObject);
procedure bImportClick(Sender: TObject); procedure bImportClick(Sender: TObject);
@@ -207,8 +211,6 @@ type
procedure bTabBorderColorClick(Sender: TObject); procedure bTabBorderColorClick(Sender: TObject);
procedure bTabGradientFromColorClick(Sender: TObject); procedure bTabGradientFromColorClick(Sender: TObject);
procedure bTabGradientToColorClick(Sender: TObject); procedure bTabGradientToColorClick(Sender: TObject);
procedure bActiveTabHeaderFontColorClick(Sender: TObject);
procedure bCopyToClipboardClick(Sender: TObject);
procedure cbItemActiveGradientKindChange(Sender: TObject); procedure cbItemActiveGradientKindChange(Sender: TObject);
procedure cbItemHottrackGradientKindChange(Sender: TObject); procedure cbItemHottrackGradientKindChange(Sender: TObject);
@@ -224,6 +226,7 @@ type
procedure edItemHotTrackBrightnessChangeChange(Sender: TObject); procedure edItemHotTrackBrightnessChangeChange(Sender: TObject);
procedure edPaneHotTrackBrightnessChangeChange(Sender: TObject); procedure edPaneHotTrackBrightnessChangeChange(Sender: TObject);
procedure edTabCaptionHeightChange(Sender: TObject);
procedure edTabCornerRadiusChange(Sender: TObject); procedure edTabCornerRadiusChange(Sender: TObject);
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
@@ -845,6 +848,13 @@ begin
tbPreview.Invalidate; tbPreview.Invalidate;
end; end;
procedure TfrmAppearanceEditWindow.edTabCaptionHeightChange(Sender: TObject);
begin
with tbPreview.Appearance.Tab do
CaptionHeight := (Sender as TSpinEdit).Value;
tbPreview.Invalidate;
end;
procedure TfrmAppearanceEditWindow.edTabCornerRadiusChange(Sender: TObject); procedure TfrmAppearanceEditWindow.edTabCornerRadiusChange(Sender: TObject);
begin begin
with tbPreview.Appearance.Tab do with tbPreview.Appearance.Tab do
@@ -899,6 +909,7 @@ begin
SetPanelColor(pActiveTabHeaderFont, TabHeaderFont.Color); SetPanelColor(pActiveTabHeaderFont, TabHeaderFont.Color);
SetPanelColor(pInactiveTabHeaderFont, InactiveTabHeaderFontColor); SetPanelColor(pInactiveTabHeaderFont, InactiveTabHeaderFontColor);
edTabCornerRadius.Value := CornerRadius; edTabCornerRadius.Value := CornerRadius;
edTabCaptionHeight.Value := CaptionHeight;
end; end;
with Pane do with Pane do