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

SpkToolbar: Avoid painting gradient in Tab if GradientType is bkSolid. Selection of predefined styles in AppearanceEditor by Listbox instead of ComboBox.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5370 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-11-19 15:21:19 +00:00
parent 34a9a3ad70
commit c277ae5e88
4 changed files with 94 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,9 +327,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Height = 395
Top = 132
Width = 558
ActivePage = TabSheet2
ActivePage = TabSheet5
Align = alClient
TabIndex = 1
TabIndex = 4
TabOrder = 1
object TabSheet1: TTabSheet
Caption = 'Tab'
@ -2314,27 +2314,24 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
ImageIndex = 4
object Label17: TLabel
AnchorSideLeft.Control = TabSheet5
AnchorSideTop.Control = CbAppearanceStyle
AnchorSideTop.Side = asrCenter
Left = 4
Left = 8
Height = 15
Top = 8
Width = 87
BorderSpacing.Left = 4
BorderSpacing.Left = 8
Caption = 'Reset to defaults'
ParentColor = False
end
object CbAppearanceStyle: TComboBox
object LbAppearanceStyle: TListBox
AnchorSideLeft.Control = Label17
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TabSheet5
Left = 115
Height = 23
Top = 4
Width = 172
BorderSpacing.Left = 24
AnchorSideTop.Control = Label17
AnchorSideTop.Side = asrBottom
Left = 8
Height = 149
Top = 27
Width = 224
BorderSpacing.Top = 4
ItemHeight = 15
Items.Strings = (
'Office2007 blue'
'Office2007 silver'
@ -2342,8 +2339,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
'Metro light'
'Metro dark'
)
OnChange = CbAppearanceStyleChange
Style = csDropDownList
ItemHeight = 15
OnClick = LbAppearanceStyleClick
TabOrder = 0
end
end

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

@ -16,7 +16,6 @@ type
{ TfrmAppearanceEditWindow }
TfrmAppearanceEditWindow = class(TForm)
CbAppearanceStyle: TComboBox;
Label15: TLabel;
Label16: TLabel;
Label19: TLabel;
@ -169,6 +168,7 @@ type
sItemRectangle: TShape;
TabSheet5: TTabSheet;
Label17: TLabel;
LbAppearanceStyle: TListbox;
procedure bExportToPascalClick(Sender: TObject);
procedure bExportToXMLClick(Sender: TObject);
@ -205,7 +205,6 @@ type
procedure bTabGradientToColorClick(Sender: TObject);
procedure bActiveTabHeaderFontColorClick(Sender: TObject);
procedure bCopyToClipboardClick(Sender: TObject);
procedure CbAppearanceStyleChange(Sender: TObject);
procedure cbItemActiveGradientKindChange(Sender: TObject);
procedure cbItemHottrackGradientKindChange(Sender: TObject);
procedure cbItemIdleGradientKindChange(Sender: TObject);
@ -223,7 +222,7 @@ type
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure LbAppearanceStyleClick(Sender: TObject);
procedure pActiveTabHeaderFontClick(Sender: TObject);
procedure pInactiveTabHeaderFontClick(Sender: TObject);
@ -427,12 +426,6 @@ begin
(Sender as TSpeedButton).Down := false;
end;
procedure TfrmAppearanceEditWindow.CbAppearanceStyleChange(Sender: TObject);
begin
tbPreview.Appearance.Reset(TSpkStyle(CbAppearanceStyle.ItemIndex));
LoadAppearance(tbPreview.Appearance);
end;
procedure TfrmAppearanceEditWindow.bCopyToClipboardClick(Sender: TObject);
begin
if mXML.Lines.Count > 0 then
@ -931,6 +924,12 @@ begin
result := tbPreview.Appearance;
end;
procedure TfrmAppearanceEditWindow.LbAppearanceStyleClick(Sender: TObject);
begin
tbPreview.Appearance.Reset(TSpkStyle(LbAppearanceStyle.ItemIndex));
LoadAppearance(tbPreview.Appearance);
end;
procedure TfrmAppearanceEditWindow.LoadAppearance(AAppearance: TSpkToolbarAppearance);
begin
with AAppearance do