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

SpkToolbar: new property HotTrackBrightnessChange of Element.Appearance.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5368 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-11-18 22:16:36 +00:00
parent bbe5b1e8a3
commit 2188bdf375
5 changed files with 145 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ type TSpkPaneAppearance = class(TPersistent)
FHotTrackInnerLightColor: TColor; FHotTrackInnerLightColor: TColor;
FHotTrackInnerDarkColor: TColor; FHotTrackInnerDarkColor: TColor;
FHotTrackCaptionColor: TColor; FHotTrackCaptionColor: TColor;
FHotTrackBrightnessChange: Integer;
FActiveFrameColor: TColor; FActiveFrameColor: TColor;
FActiveGradientFromColor: TColor; FActiveGradientFromColor: TColor;
FActiveGradientToColor: TColor; FActiveGradientToColor: TColor;
@@ -152,6 +153,7 @@ type TSpkPaneAppearance = class(TPersistent)
procedure SetHotTrackGradientType(const Value: TBackgroundKind); procedure SetHotTrackGradientType(const Value: TBackgroundKind);
procedure SetHotTrackInnerDarkColor(const Value: TColor); procedure SetHotTrackInnerDarkColor(const Value: TColor);
procedure SetHotTrackInnerLightColor(const Value: TColor); procedure SetHotTrackInnerLightColor(const Value: TColor);
procedure SetHotTrackBrightnessChange(const Value: Integer);
procedure SetIdleCaptionColor(const Value: TColor); procedure SetIdleCaptionColor(const Value: TColor);
procedure SetIdleFrameColor(const Value: TColor); procedure SetIdleFrameColor(const Value: TColor);
procedure SetIdleGradientFromColor(const Value: TColor); procedure SetIdleGradientFromColor(const Value: TColor);
@@ -184,6 +186,7 @@ type TSpkPaneAppearance = class(TPersistent)
property HotTrackInnerLightColor: TColor read FHotTrackInnerLightColor write SetHotTrackInnerLightColor; property HotTrackInnerLightColor: TColor read FHotTrackInnerLightColor write SetHotTrackInnerLightColor;
property HotTrackInnerDarkColor: TColor read FHotTrackInnerDarkColor write SetHotTrackInnerDarkColor; property HotTrackInnerDarkColor: TColor read FHotTrackInnerDarkColor write SetHotTrackInnerDarkColor;
property HotTrackCaptionColor: TColor read FHotTrackCaptionColor write SetHotTrackCaptionColor; property HotTrackCaptionColor: TColor read FHotTrackCaptionColor write SetHotTrackCaptionColor;
property HotTrackBrightnessChange: Integer read FHotTrackBrightnessChange write SetHotTrackBrightnessChange default 20;
property ActiveFrameColor: TColor read FActiveFrameColor write SetActiveFrameColor; property ActiveFrameColor: TColor read FActiveFrameColor write SetActiveFrameColor;
property ActiveGradientFromColor: TColor read FActiveGradientFromColor write SetActiveGradientFromColor; property ActiveGradientFromColor: TColor read FActiveGradientFromColor write SetActiveGradientFromColor;
property ActiveGradientToColor: TColor read FActiveGradientToColor write SetActiveGradientToColor; property ActiveGradientToColor: TColor read FActiveGradientToColor write SetActiveGradientToColor;
@@ -755,6 +758,7 @@ begin
FHotTrackInnerLightColor := SrcAppearance.HotTrackInnerLightColor; FHotTrackInnerLightColor := SrcAppearance.HotTrackInnerLightColor;
FHotTrackInnerDarkColor := SrcAppearance.HotTrackInnerDarkColor; FHotTrackInnerDarkColor := SrcAppearance.HotTrackInnerDarkColor;
FHotTrackCaptionColor := SrcAppearance.HotTrackCaptionColor; FHotTrackCaptionColor := SrcAppearance.HotTrackCaptionColor;
FHotTrackBrightnessChange := SrcAppearance.HotTrackBrightnessChange;
FActiveFrameColor := SrcAppearance.ActiveFrameColor; FActiveFrameColor := SrcAppearance.ActiveFrameColor;
FActiveGradientFromColor := SrcAppearance.ActiveGradientFromColor; FActiveGradientFromColor := SrcAppearance.ActiveGradientFromColor;
FActiveGradientToColor := SrcAppearance.ActiveGradientToColor; FActiveGradientToColor := SrcAppearance.ActiveGradientToColor;
@@ -775,6 +779,7 @@ begin
inherited Create; inherited Create;
FDispatch := ADispatch; FDispatch := ADispatch;
FCaptionFont := TFont.Create; FCaptionFont := TFont.Create;
FHotTrackBrightnessChange := 40;
Reset; Reset;
end; end;
@@ -824,7 +829,7 @@ begin
if Assigned(Subnode) then if Assigned(Subnode) then
FIdleCaptionColor := Subnode.TextAsColor; FIdleCaptionColor := Subnode.TextAsColor;
// Hottrack // HotTrack
Subnode := Node['HottrackFrameColor', false]; Subnode := Node['HottrackFrameColor', false];
if Assigned(Subnode) then if Assigned(Subnode) then
FHottrackFrameColor := Subnode.TextAsColor; FHottrackFrameColor := Subnode.TextAsColor;
@@ -853,6 +858,10 @@ begin
if Assigned(Subnode) then if Assigned(Subnode) then
FHottrackCaptionColor := Subnode.TextAsColor; FHottrackCaptionColor := Subnode.TextAsColor;
Subnode := Node['HottrackBrightnessChange', false];
if Assigned(Subnode) then
FHottrackBrightnessChange := Subnode.TextAsInteger;
// Active // Active
Subnode := Node['ActiveFrameColor', false]; Subnode := Node['ActiveFrameColor', false];
if Assigned(Subnode) then if Assigned(Subnode) then
@@ -909,6 +918,7 @@ begin
FHotTrackInnerLightColor := rgb(255, 241, 197); FHotTrackInnerLightColor := rgb(255, 241, 197);
FHotTrackInnerDarkColor := rgb(216, 194, 122); FHotTrackInnerDarkColor := rgb(216, 194, 122);
FHotTrackCaptionColor := rgb(111, 66, 135); FHotTrackCaptionColor := rgb(111, 66, 135);
FHotTrackBrightnessChange := 40;
FActiveFrameColor := rgb(139, 118, 84); FActiveFrameColor := rgb(139, 118, 84);
FActiveGradientFromColor := rgb(254, 187, 108); FActiveGradientFromColor := rgb(254, 187, 108);
FActiveGradientToColor := rgb(252, 146, 61); FActiveGradientToColor := rgb(252, 146, 61);
@@ -931,6 +941,7 @@ begin
FIdleInnerDarkColor := $00C7C0BA; FIdleInnerDarkColor := $00C7C0BA;
FIdleInnerLightColor := $00F6F2F0; FIdleInnerLightColor := $00F6F2F0;
FIdleCaptionColor := $0060655F; FIdleCaptionColor := $0060655F;
FHotTrackBrightnessChange := 40;
FHotTrackFrameColor := $009BCFDD; FHotTrackFrameColor := $009BCFDD;
FHotTrackGradientFromColor := $00DAFCFF; FHotTrackGradientFromColor := $00DAFCFF;
FHotTrackGradientToColor := $004DD7FF; FHotTrackGradientToColor := $004DD7FF;
@@ -982,6 +993,7 @@ begin
FHotTrackInnerDarkColor := $00F7EFE8; FHotTrackInnerDarkColor := $00F7EFE8;
FHotTrackInnerLightColor := $00F7EFE8; FHotTrackInnerLightColor := $00F7EFE8;
FHotTrackCaptionColor := $003F3F3F; FHotTrackCaptionColor := $003F3F3F;
FHotTrackBrightnessChange := 20;
FActiveFrameColor := $00E4A262; FActiveFrameColor := $00E4A262;
FActiveGradientFromColor := $00F7E0C9; FActiveGradientFromColor := $00F7E0C9;
FActiveGradientToColor := $00F7E0C9; FActiveGradientToColor := $00F7E0C9;
@@ -1010,6 +1022,7 @@ begin
FHotTrackInnerDarkColor := $00805B3D; FHotTrackInnerDarkColor := $00805B3D;
FHotTrackInnerLightColor := $00805B3D; FHotTrackInnerLightColor := $00805B3D;
FHotTrackCaptionColor := $00F2F2F2; FHotTrackCaptionColor := $00F2F2F2;
FHotTrackBrightnessChange := 10;
FActiveFrameColor := $00000000; FActiveFrameColor := $00000000;
FActiveGradientFromColor := $00000000; FActiveGradientFromColor := $00000000;
FActiveGradientToColor := $00000000; FActiveGradientToColor := $00000000;
@@ -1043,6 +1056,7 @@ begin
Add(' HotTrackInnerDarkColor := $' + IntToHex(FHotTrackInnerDarkColor, 8) + ';'); Add(' HotTrackInnerDarkColor := $' + IntToHex(FHotTrackInnerDarkColor, 8) + ';');
Add(' HotTrackInnerLightColor := $' + IntToHex(FHotTrackInnerLightColor, 8) + ';'); Add(' HotTrackInnerLightColor := $' + IntToHex(FHotTrackInnerLightColor, 8) + ';');
Add(' HotTrackCaptionColor := $' + IntToHex(FHotTrackCaptionColor, 8) + ';'); Add(' HotTrackCaptionColor := $' + IntToHex(FHotTrackCaptionColor, 8) + ';');
Add(' HotTrackBrightnessChange := ' + IntToStr(FHotTrackBrightnessChange) + ';');
Add(' ActiveFrameColor := $' + IntToHex(FActiveFrameColor, 8) + ';'); Add(' ActiveFrameColor := $' + IntToHex(FActiveFrameColor, 8) + ';');
Add(' ActiveGradientFromColor := $' + IntToHex(FActiveGradientFromColor, 8) + ';'); Add(' ActiveGradientFromColor := $' + IntToHex(FActiveGradientFromColor, 8) + ';');
@@ -1067,7 +1081,7 @@ begin
Subnode := Node['CaptionFont', true]; Subnode := Node['CaptionFont', true];
TSpkXMLTools.Save(Subnode, FCaptionFont); TSpkXMLTools.Save(Subnode, FCaptionFont);
// *** Idle *** // Idle
Subnode := Node['IdleFrameColor', true]; Subnode := Node['IdleFrameColor', true];
Subnode.TextAsColor := FIdleFrameColor; Subnode.TextAsColor := FIdleFrameColor;
@@ -1089,7 +1103,7 @@ begin
Subnode := Node['IdleCaptionColor', true]; Subnode := Node['IdleCaptionColor', true];
Subnode.TextAsColor := FIdleCaptionColor; Subnode.TextAsColor := FIdleCaptionColor;
// *** Hottrack *** // HotTrack
Subnode := Node['HottrackFrameColor', true]; Subnode := Node['HottrackFrameColor', true];
Subnode.TextAsColor := FHottrackFrameColor; Subnode.TextAsColor := FHottrackFrameColor;
@@ -1111,7 +1125,10 @@ begin
Subnode := Node['HottrackCaptionColor', true]; Subnode := Node['HottrackCaptionColor', true];
Subnode.TextAsColor := FHottrackCaptionColor; Subnode.TextAsColor := FHottrackCaptionColor;
// *** Active *** Subnode := Node['HottrackBrightnessChange', true];
Subnode.TextAsInteger := FHotTrackBrightnessChange;
// Active
Subnode := Node['ActiveFrameColor', true]; Subnode := Node['ActiveFrameColor', true];
Subnode.TextAsColor := FActiveFrameColor; Subnode.TextAsColor := FActiveFrameColor;
@@ -1133,6 +1150,7 @@ begin
Subnode := Node['ActiveCaptionColor', true]; Subnode := Node['ActiveCaptionColor', true];
Subnode.TextAsColor := FActiveCaptionColor; Subnode.TextAsColor := FActiveCaptionColor;
// Other
Subnode := Node['Style', true]; Subnode := Node['Style', true];
Subnode.TextAsInteger := integer(FStyle); Subnode.TextAsInteger := integer(FStyle);
end; end;
@@ -1140,154 +1158,161 @@ end;
procedure TSpkElementAppearance.SetActiveCaptionColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveCaptionColor(const Value: TColor);
begin begin
FActiveCaptionColor := Value; FActiveCaptionColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveFrameColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveFrameColor(const Value: TColor);
begin begin
FActiveFrameColor := Value; FActiveFrameColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveGradientFromColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveGradientFromColor(const Value: TColor);
begin begin
FActiveGradientFromColor := Value; FActiveGradientFromColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveGradientToColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveGradientToColor(const Value: TColor);
begin begin
FActiveGradientToColor := Value; FActiveGradientToColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveGradientType(const Value: TBackgroundKind); procedure TSpkElementAppearance.SetActiveGradientType(const Value: TBackgroundKind);
begin begin
FActiveGradientType := Value; FActiveGradientType := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveInnerDarkColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveInnerDarkColor(const Value: TColor);
begin begin
FActiveInnerDarkColor := Value; FActiveInnerDarkColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetActiveInnerLightColor(const Value: TColor); procedure TSpkElementAppearance.SetActiveInnerLightColor(const Value: TColor);
begin begin
FActiveInnerLightColor := Value; FActiveInnerLightColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetCaptionFont(const Value: TFont); procedure TSpkElementAppearance.SetCaptionFont(const Value: TFont);
begin begin
FCaptionFont.assign(Value); FCaptionFont.Assign(Value);
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged;
end;
procedure TSpkElementAppearance.SetHotTrackBrightnessChange(const Value: Integer);
begin
FHotTrackBrightnessChange := Value;
if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackCaptionColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackCaptionColor(const Value: TColor);
begin begin
FHotTrackCaptionColor := Value; FHotTrackCaptionColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackFrameColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackFrameColor(const Value: TColor);
begin begin
FHotTrackFrameColor := Value; FHotTrackFrameColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackGradientFromColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackGradientFromColor(const Value: TColor);
begin begin
FHotTrackGradientFromColor := Value; FHotTrackGradientFromColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackGradientToColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackGradientToColor(const Value: TColor);
begin begin
FHotTrackGradientToColor := Value; FHotTrackGradientToColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackGradientType(const Value: TBackgroundKind); procedure TSpkElementAppearance.SetHotTrackGradientType(const Value: TBackgroundKind);
begin begin
FHotTrackGradientType := Value; FHotTrackGradientType := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackInnerDarkColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackInnerDarkColor(const Value: TColor);
begin begin
FHotTrackInnerDarkColor := Value; FHotTrackInnerDarkColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetHotTrackInnerLightColor(const Value: TColor); procedure TSpkElementAppearance.SetHotTrackInnerLightColor(const Value: TColor);
begin begin
FHotTrackInnerLightColor := Value; FHotTrackInnerLightColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleCaptionColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleCaptionColor(const Value: TColor);
begin begin
FIdleCaptionColor := Value; FIdleCaptionColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleFrameColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleFrameColor(const Value: TColor);
begin begin
FIdleFrameColor := Value; FIdleFrameColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleGradientFromColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleGradientFromColor(const Value: TColor);
begin begin
FIdleGradientFromColor := Value; FIdleGradientFromColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleGradientToColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleGradientToColor(const Value: TColor);
begin begin
FIdleGradientToColor := Value; FIdleGradientToColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleGradientType(const Value: TBackgroundKind); procedure TSpkElementAppearance.SetIdleGradientType(const Value: TBackgroundKind);
begin begin
FIdleGradientType := Value; FIdleGradientType := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleInnerDarkColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleInnerDarkColor(const Value: TColor);
begin begin
FIdleInnerDarkColor := Value; FIdleInnerDarkColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
procedure TSpkElementAppearance.SetIdleInnerLightColor(const Value: TColor); procedure TSpkElementAppearance.SetIdleInnerLightColor(const Value: TColor);
begin begin
FIdleInnerLightColor := Value; FIdleInnerLightColor := Value;
if FDispatch<>nil then if FDispatch <> nil then
FDispatch.NotifyAppearanceChanged; FDispatch.NotifyAppearanceChanged;
end; end;
@@ -1303,8 +1328,8 @@ end;
constructor TSpkToolbarAppearanceDispatch.Create( constructor TSpkToolbarAppearanceDispatch.Create(
AToolbarAppearance: TSpkToolbarAppearance); AToolbarAppearance: TSpkToolbarAppearance);
begin begin
inherited Create; inherited Create;
FToolbarAppearance:=AToolbarAppearance; FToolbarAppearance := AToolbarAppearance;
end; end;
procedure TSpkToolbarAppearanceDispatch.NotifyAppearanceChanged; procedure TSpkToolbarAppearanceDispatch.NotifyAppearanceChanged;

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

@@ -48,6 +48,7 @@ type TSpkBaseButton = class;
function IsVisibleLinked: Boolean; override; function IsVisibleLinked: Boolean; override;
end; end;
{ TSpkBaseButton } { TSpkBaseButton }
TSpkBaseButton = class abstract(TSpkBaseItem) TSpkBaseButton = class abstract(TSpkBaseItem)
@@ -115,7 +116,10 @@ type TSpkBaseButton = class;
property OnClick : TNotifyEvent read FOnClick write FOnClick; property OnClick : TNotifyEvent read FOnClick write FOnClick;
end; end;
type TSpkLargeButton = class(TSpkBaseButton)
{ TSpkLargeButton }
TSpkLargeButton = class(TSpkBaseButton)
private private
FLargeImageIndex: TImageIndex; FLargeImageIndex: TImageIndex;
procedure FindBreakPlace(s: string; out Position: integer; out Width: integer); procedure FindBreakPlace(s: string; out Position: integer; out Width: integer);
@@ -136,7 +140,10 @@ type TSpkLargeButton = class(TSpkBaseButton)
property DropdownMenu; property DropdownMenu;
end; end;
type TSpkSmallButton = class(TSpkBaseButton)
{ TSpkSmallButton }
TSpkSmallButton = class(TSpkBaseButton)
private private
FImageIndex: TImageIndex; FImageIndex: TImageIndex;
FTableBehaviour: TSpkItemTableBehaviour; FTableBehaviour: TSpkItemTableBehaviour;
@@ -775,7 +782,7 @@ begin
if (FRect.Width < 2*LargeButtonRadius) or (FRect.Height < 2*LargeButtonRadius) then if (FRect.Width < 2*LargeButtonRadius) or (FRect.Height < 2*LargeButtonRadius) then
exit; exit;
delta := 40; delta := FAppearance.Element.HotTrackBrightnessChange;
case FAppearance.Element.Style of case FAppearance.Element.Style of
esRounded: esRounded:
cornerRadius := LargeButtonRadius; cornerRadius := LargeButtonRadius;
@@ -1295,6 +1302,7 @@ begin
if (FRect.Width < 2*SmallButtonRadius) or (FRect.Height < 2*SmallButtonRadius) then if (FRect.Width < 2*SmallButtonRadius) or (FRect.Height < 2*SmallButtonRadius) then
exit; exit;
delta := FAppearance.Element.HotTrackBrightnessChange;
case FAppearance.Element.Style of case FAppearance.Element.Style of
esRounded: esRounded:
cornerRadius := SmallButtonRadius; cornerRadius := SmallButtonRadius;
@@ -1333,7 +1341,6 @@ begin
end else end else
if (FButtonState in [bsDropdownHotTrack, bsDropdownPressed]) then if (FButtonState in [bsDropdownHotTrack, bsDropdownPressed]) then
begin begin
delta := 40;
frameColor := TColorTools.Brighten(FAppearance.Element.HotTrackFrameColor, delta); frameColor := TColorTools.Brighten(FAppearance.Element.HotTrackFrameColor, delta);
innerDarkColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerDarkColor, delta); innerDarkColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerDarkColor, delta);
innerLightColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerLightColor, delta); innerLightColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerLightColor, delta);
@@ -1436,7 +1443,6 @@ begin
end else end else
if (FButtonState in [bsBtnHottrack, bsBtnPressed]) then if (FButtonState in [bsBtnHottrack, bsBtnPressed]) then
begin begin
delta := 40;
frameColor := TColorTools.Brighten(FAppearance.Element.HotTrackFrameColor, delta); frameColor := TColorTools.Brighten(FAppearance.Element.HotTrackFrameColor, delta);
innerLightColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerLightColor, delta); innerLightColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerLightColor, delta);
innerDarkColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerDarkColor, delta); innerDarkColor := TColorTools.Brighten(FAppearance.Element.HotTrackInnerDarkColor, delta);

11
components/spktoolbar/demos/styles/unit1.lfm
View File

@@ -3,7 +3,7 @@ object Form1: TForm1
Height = 660 Height = 660
Top = 130 Top = 130
Width = 506 Width = 506
Caption = 'Form1' Caption = 'spkToolbar Styles'
ClientHeight = 660 ClientHeight = 660
ClientWidth = 506 ClientWidth = 506
Color = clMedGray Color = clMedGray
@@ -47,6 +47,7 @@ object Form1: TForm1
Appearance.Element.HotTrackInnerLightColor = 12972543 Appearance.Element.HotTrackInnerLightColor = 12972543
Appearance.Element.HotTrackInnerDarkColor = 8045272 Appearance.Element.HotTrackInnerDarkColor = 8045272
Appearance.Element.HotTrackCaptionColor = 8864367 Appearance.Element.HotTrackCaptionColor = 8864367
Appearance.Element.HotTrackBrightnessChange = 40
Appearance.Element.ActiveFrameColor = 5535371 Appearance.Element.ActiveFrameColor = 5535371
Appearance.Element.ActiveGradientFromColor = 7126014 Appearance.Element.ActiveGradientFromColor = 7126014
Appearance.Element.ActiveGradientToColor = 4035324 Appearance.Element.ActiveGradientToColor = 4035324
@@ -96,6 +97,7 @@ object Form1: TForm1
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -271,6 +273,7 @@ object Form1: TForm1
Appearance.Element.HotTrackInnerLightColor = 12972543 Appearance.Element.HotTrackInnerLightColor = 12972543
Appearance.Element.HotTrackInnerDarkColor = 8045272 Appearance.Element.HotTrackInnerDarkColor = 8045272
Appearance.Element.HotTrackCaptionColor = 8864367 Appearance.Element.HotTrackCaptionColor = 8864367
Appearance.Element.HotTrackBrightnessChange = 40
Appearance.Element.ActiveFrameColor = 5535371 Appearance.Element.ActiveFrameColor = 5535371
Appearance.Element.ActiveGradientFromColor = 7126014 Appearance.Element.ActiveGradientFromColor = 7126014
Appearance.Element.ActiveGradientToColor = 4035324 Appearance.Element.ActiveGradientToColor = 4035324
@@ -320,6 +323,7 @@ object Form1: TForm1
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -495,6 +499,7 @@ object Form1: TForm1
Appearance.Element.HotTrackInnerLightColor = 16445385 Appearance.Element.HotTrackInnerLightColor = 16445385
Appearance.Element.HotTrackInnerDarkColor = 12687889 Appearance.Element.HotTrackInnerDarkColor = 12687889
Appearance.Element.HotTrackCaptionColor = 8864367 Appearance.Element.HotTrackCaptionColor = 8864367
Appearance.Element.HotTrackBrightnessChange = 40
Appearance.Element.ActiveFrameColor = 7823883 Appearance.Element.ActiveFrameColor = 7823883
Appearance.Element.ActiveGradientFromColor = 16046978 Appearance.Element.ActiveGradientFromColor = 16046978
Appearance.Element.ActiveGradientToColor = 15516990 Appearance.Element.ActiveGradientToColor = 15516990
@@ -544,6 +549,7 @@ object Form1: TForm1
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -770,6 +776,7 @@ object Form1: TForm1
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -947,6 +954,7 @@ object Form1: TForm1
Appearance.Element.HotTrackInnerLightColor = 8411965 Appearance.Element.HotTrackInnerLightColor = 8411965
Appearance.Element.HotTrackInnerDarkColor = 8411965 Appearance.Element.HotTrackInnerDarkColor = 8411965
Appearance.Element.HotTrackCaptionColor = 15921906 Appearance.Element.HotTrackCaptionColor = 15921906
Appearance.Element.HotTrackBrightnessChange = 10
Appearance.Element.ActiveFrameColor = clBlack Appearance.Element.ActiveFrameColor = clBlack
Appearance.Element.ActiveGradientFromColor = clBlack Appearance.Element.ActiveGradientFromColor = clBlack
Appearance.Element.ActiveGradientToColor = clBlack Appearance.Element.ActiveGradientToColor = clBlack
@@ -996,6 +1004,7 @@ object Form1: TForm1
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324

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

@@ -64,6 +64,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Appearance.Element.HotTrackInnerLightColor = 12972543 Appearance.Element.HotTrackInnerLightColor = 12972543
Appearance.Element.HotTrackInnerDarkColor = 8045272 Appearance.Element.HotTrackInnerDarkColor = 8045272
Appearance.Element.HotTrackCaptionColor = 8864367 Appearance.Element.HotTrackCaptionColor = 8864367
Appearance.Element.HotTrackBrightnessChange = 40
Appearance.Element.ActiveFrameColor = 5535371 Appearance.Element.ActiveFrameColor = 5535371
Appearance.Element.ActiveGradientFromColor = 7126014 Appearance.Element.ActiveGradientFromColor = 7126014
Appearance.Element.ActiveGradientToColor = 4035324 Appearance.Element.ActiveGradientToColor = 4035324
@@ -114,6 +115,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -304,6 +306,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
CustomAppearance.Element.HotTrackInnerLightColor = 12972543 CustomAppearance.Element.HotTrackInnerLightColor = 12972543
CustomAppearance.Element.HotTrackInnerDarkColor = 8045272 CustomAppearance.Element.HotTrackInnerDarkColor = 8045272
CustomAppearance.Element.HotTrackCaptionColor = 8864367 CustomAppearance.Element.HotTrackCaptionColor = 8864367
CustomAppearance.Element.HotTrackBrightnessChange = 40
CustomAppearance.Element.ActiveFrameColor = 5535371 CustomAppearance.Element.ActiveFrameColor = 5535371
CustomAppearance.Element.ActiveGradientFromColor = 7126014 CustomAppearance.Element.ActiveGradientFromColor = 7126014
CustomAppearance.Element.ActiveGradientToColor = 4035324 CustomAppearance.Element.ActiveGradientToColor = 4035324
@@ -324,9 +327,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Height = 395 Height = 395
Top = 132 Top = 132
Width = 558 Width = 558
ActivePage = TabSheet5 ActivePage = TabSheet2
Align = alClient Align = alClient
TabIndex = 4 TabIndex = 1
TabOrder = 1 TabOrder = 1
object TabSheet1: TTabSheet object TabSheet1: TTabSheet
Caption = 'Tab' Caption = 'Tab'
@@ -940,7 +943,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
end end
object pPaneCaptionFontColor: TPanel object pPaneCaptionFontColor: TPanel
AnchorSideLeft.Control = pPaneCaptionBackground AnchorSideLeft.Control = pPaneCaptionBackground
AnchorSideTop.Control = ePaneHotTrackBrightnessChange AnchorSideTop.Control = edPaneHotTrackBrightnessChange
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = pPaneCaptionBackground AnchorSideRight.Control = pPaneCaptionBackground
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
@@ -1138,7 +1141,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Shape = bsSpacer Shape = bsSpacer
end end
object Label15: TLabel object Label15: TLabel
AnchorSideTop.Control = ePaneHotTrackBrightnessChange AnchorSideTop.Control = edPaneHotTrackBrightnessChange
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = LblPaneCaptionBackground AnchorSideRight.Control = LblPaneCaptionBackground
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
@@ -1151,7 +1154,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Caption = 'HotTrack brightness'#13#10'change' Caption = 'HotTrack brightness'#13#10'change'
ParentColor = False ParentColor = False
end end
object ePaneHotTrackBrightnessChange: TSpinEdit object edPaneHotTrackBrightnessChange: TSpinEdit
AnchorSideLeft.Control = pPaneCaptionBackground AnchorSideLeft.Control = pPaneCaptionBackground
AnchorSideTop.Control = pPaneCaptionBackground AnchorSideTop.Control = pPaneCaptionBackground
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
@@ -1165,13 +1168,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
MinValue = -100 MinValue = -100
OnChange = ePaneHotTrackBrightnessChangeChange OnChange = edPaneHotTrackBrightnessChangeChange
TabOrder = 10 TabOrder = 10
end end
object Label16: TLabel object Label16: TLabel
AnchorSideLeft.Control = ePaneHotTrackBrightnessChange AnchorSideLeft.Control = edPaneHotTrackBrightnessChange
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ePaneHotTrackBrightnessChange AnchorSideTop.Control = edPaneHotTrackBrightnessChange
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 247 Left = 247
Height = 15 Height = 15
@@ -2171,6 +2174,48 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
Shape = bsSpacer Shape = bsSpacer
end end
object Label19: TLabel
AnchorSideLeft.Control = edItemHotTrackBrightnessChange
AnchorSideBottom.Control = edItemHotTrackBrightnessChange
Left = 259
Height = 15
Top = 285
Width = 97
Alignment = taRightJustify
Anchors = [akLeft, akBottom]
BorderSpacing.Bottom = 4
Caption = 'Brightness change'
ParentColor = False
end
object edItemHotTrackBrightnessChange: TSpinEdit
AnchorSideLeft.Control = pItemHottrackInnerLight
AnchorSideTop.Control = cbItemStyle
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pItemHottrackInnerLight
AnchorSideRight.Side = asrBottom
Left = 259
Height = 23
Top = 304
Width = 100
Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight]
MinValue = -100
OnChange = edItemHotTrackBrightnessChangeChange
TabOrder = 24
end
object Label20: TLabel
AnchorSideLeft.Control = edItemHotTrackBrightnessChange
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = edItemHotTrackBrightnessChange
AnchorSideTop.Side = asrCenter
Left = 363
Height = 15
Top = 308
Width = 10
BorderSpacing.Left = 4
Caption = '%'
ParentColor = False
end
end end
object TabSheet4: TTabSheet object TabSheet4: TTabSheet
Caption = 'Import / export' Caption = 'Import / export'

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

@@ -19,9 +19,12 @@ type
CbAppearanceStyle: TComboBox; CbAppearanceStyle: TComboBox;
Label15: TLabel; Label15: TLabel;
Label16: TLabel; Label16: TLabel;
Label19: TLabel;
Label20: TLabel;
PaneHSpacer: TBevel; PaneHSpacer: TBevel;
ItemHSpacer: TBevel; ItemHSpacer: TBevel;
ePaneHotTrackBrightnessChange: TSpinEdit; edPaneHotTrackBrightnessChange: TSpinEdit;
edItemHotTrackBrightnessChange: TSpinEdit;
TabVSpacer: TBevel; TabVSpacer: TBevel;
bInactiveTabHeaderFontColor: TSpeedButton; bInactiveTabHeaderFontColor: TSpeedButton;
bItemActiveInnerDarkColor: TSpeedButton; bItemActiveInnerDarkColor: TSpeedButton;
@@ -214,7 +217,8 @@ type
procedure cbLinkItemClick(Sender: TObject); procedure cbLinkItemClick(Sender: TObject);
procedure cbLinkPaneClick(Sender: TObject); procedure cbLinkPaneClick(Sender: TObject);
procedure cbLinkTabClick(Sender: TObject); procedure cbLinkTabClick(Sender: TObject);
procedure ePaneHotTrackBrightnessChangeChange(Sender: TObject); procedure edItemHotTrackBrightnessChangeChange(Sender: TObject);
procedure edPaneHotTrackBrightnessChangeChange(Sender: TObject);
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
@@ -808,7 +812,15 @@ begin
Result := false; Result := false;
end; end;
procedure TfrmAppearanceEditWindow.ePaneHotTrackBrightnessChangeChange( procedure TfrmAppearanceEditWindow.edItemHotTrackBrightnessChangeChange(
Sender: TObject);
begin
with tbPreview.Appearance.Element do
HotTrackBrightnessChange := (Sender as TSpinEdit).Value;
tbPreview.Invalidate;
end;
procedure TfrmAppearanceEditWindow.edPaneHotTrackBrightnessChangeChange(
Sender: TObject); Sender: TObject);
begin begin
with tbPreview.Appearance.Pane do with tbPreview.Appearance.Pane do
@@ -945,6 +957,7 @@ begin
SetPanelFont(pPaneCaptionFont, CaptionFont); SetPanelFont(pPaneCaptionFont, CaptionFont);
SetPanelColor(pPaneCaptionFontColor, CaptionFont.Color); SetPanelColor(pPaneCaptionFontColor, CaptionFont.Color);
cbPaneStyle.ItemIndex := ord(Style); cbPaneStyle.ItemIndex := ord(Style);
edPaneHotTrackBrightnessChange.Value := HotTrackBrightnessChange;
end; end;
with Element do with Element do
@@ -976,6 +989,7 @@ begin
SetPanelColor(pItemActiveInnerLight, ActiveInnerLightColor); SetPanelColor(pItemActiveInnerLight, ActiveInnerLightColor);
cbItemStyle.ItemIndex := ord(Style); cbItemStyle.ItemIndex := ord(Style);
edItemHotTrackBrightnessChange.Value := HotTrackBrightnessChange;
end; end;
end; end;
end; end;