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

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

@ -1289,9 +1289,9 @@ procedure TSpkToolbar.ValidateBuffer;
procedure DrawBackgroundColor; procedure DrawBackgroundColor;
begin begin
FBuffer.canvas.brush.color := Color; FBuffer.Canvas.Brush.Color := Color;
FBuffer.canvas.brush.style := bsSolid; FBuffer.Canvas.Brush.Style := bsSolid;
FBuffer.canvas.fillrect(Rect(0, 0, self.Width, self.Height)); FBuffer.Canvas.FillRect(Rect(0, 0, self.Width, self.Height));
end; end;
procedure DrawBody; procedure DrawBody;
@ -1415,7 +1415,7 @@ procedure TSpkToolbar.ValidateBuffer;
end; end;
procedure DrawTab(index: integer; procedure DrawTab(index: integer;
Border, GradientFrom, GradientTo, TextColor: TColor); Border, GradientFrom, GradientTo: TColor);
var var
TabRect: T2DIntRect; TabRect: T2DIntRect;
TabRegion: HRGN; TabRegion: HRGN;
@ -1426,49 +1426,64 @@ procedure TSpkToolbar.ValidateBuffer;
TabRect := FTabRects[index]; TabRect := FTabRects[index];
//Middle rectangle //Middle rectangle
TabRegion := CreateRectRgn(TabRect.Left + TabCornerRadius - 1, TabRegion := CreateRectRgn(
TabRect.Left + TabCornerRadius - 1,
TabRect.Top + TabCornerRadius, TabRect.Top + TabCornerRadius,
TabRect.Right - TabCornerRadius + 1 + TabRect.Right - TabCornerRadius + 1 + 1,
1, TabRect.Bottom + 1); TabRect.Bottom + 1
);
//Top part with top convex curves //Top part with top convex curves
TmpRegion := CreateRectRgn(TabRect.Left + 2 * TabCornerRadius - 1, TmpRegion := CreateRectRgn(
TabRect.Top, TabRect.Right - TabRect.Left + 2 * TabCornerRadius - 1,
2 * TabCornerRadius + 1 + 1, TabRect.Top +
TabCornerRadius);
CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR);
DeleteObject(TmpRegion);
TmpRegion := CreateEllipticRgn(TabRect.Left + TabCornerRadius -
1, TabRect.Top,
TabRect.Left + 3 * TabCornerRadius,
TabRect.Top + 2 * TabCornerRadius + 1);
CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR);
DeleteObject(TmpRegion);
TmpRegion := CreateEllipticRgn(TabRect.Right - 3 * TabCornerRadius + 2,
TabRect.Top, TabRect.Top,
TabRect.Right - TabCornerRadius + TabRect.Right - 2 * TabCornerRadius + 1 + 1,
3, TabRect.Top + 2 * TabCornerRadius + 1); TabRect.Top + TabCornerRadius
);
CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR);
DeleteObject(TmpRegion);
TmpRegion := CreateEllipticRgn(
TabRect.Left + TabCornerRadius - 1,
TabRect.Top,
TabRect.Left + 3 * TabCornerRadius,
TabRect.Top + 2 * TabCornerRadius + 1
);
CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR);
DeleteObject(TmpRegion);
TmpRegion := CreateEllipticRgn(
TabRect.Right - 3 * TabCornerRadius + 2,
TabRect.Top,
TabRect.Right - TabCornerRadius + 3,
TabRect.Top + 2 * TabCornerRadius + 1
);
CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR); CombineRgn(TabRegion, TabRegion, TmpRegion, RGN_OR);
DeleteObject(TmpRegion); DeleteObject(TmpRegion);
//Bottom part with bottom convex curves //Bottom part with bottom convex curves
TmpRegion := CreateRectRgn(TabRect.Left, TabRect.Bottom - TmpRegion := CreateRectRgn(
TabCornerRadius, TabRect.Right + 1, TabRect.Left,
TabRect.Bottom + 1); TabRect.Bottom - TabCornerRadius,
TabRect.Right + 1,
TabRect.Bottom + 1
);
TmpRegion2 := CreateEllipticRgn(TabRect.Left - TabCornerRadius, TmpRegion2 := CreateEllipticRgn(
TabRect.Left - TabCornerRadius,
TabRect.Bottom - 2 * TabCornerRadius + 1, TabRect.Bottom - 2 * TabCornerRadius + 1,
TabRect.Left + TabCornerRadius + TabRect.Left + TabCornerRadius + 1,
1, TabRect.Bottom + 2); TabRect.Bottom + 2
);
CombineRgn(TmpRegion, TmpRegion, TmpRegion2, RGN_DIFF); CombineRgn(TmpRegion, TmpRegion, TmpRegion2, RGN_DIFF);
DeleteObject(TmpRegion2); DeleteObject(TmpRegion2);
TmpRegion2 := CreateEllipticRgn(TabRect.Right - TabCornerRadius + TmpRegion2 := CreateEllipticRgn(
1, TabRect.Bottom - 2 * TabCornerRadius + TabRect.Right - TabCornerRadius + 1,
1, TabRect.Right + TabCornerRadius + 2, TabRect.Bottom - 2 * TabCornerRadius + 1,
TabRect.Bottom + 2); TabRect.Right + TabCornerRadius + 2,
TabRect.Bottom + 2
);
CombineRgn(TmpRegion, TmpRegion, TmpRegion2, RGN_DIFF); CombineRgn(TmpRegion, TmpRegion, TmpRegion2, RGN_DIFF);
DeleteObject(TmpRegion2); DeleteObject(TmpRegion2);
@ -1495,6 +1510,7 @@ procedure TSpkToolbar.ValidateBuffer;
cpRightBottom, cpRightBottom,
Border, Border,
FTabClipRect); FTabClipRect);
TGuiTools.DrawAARoundCorner(FBuffer, TGuiTools.DrawAARoundCorner(FBuffer,
{$IFDEF EnhancedRecordSupport} {$IFDEF EnhancedRecordSupport}
T2DIntPoint.Create(TabRect.right - TabCornerRadius + 1, TabRect.bottom - TabCornerRadius + 1), T2DIntPoint.Create(TabRect.right - TabCornerRadius + 1, TabRect.bottom - TabCornerRadius + 1),
@ -1512,6 +1528,7 @@ procedure TSpkToolbar.ValidateBuffer;
TabRect.Bottom - TabCornerRadius + 1, TabRect.Bottom - TabCornerRadius + 1,
Border, Border,
FTabClipRect); FTabClipRect);
TGuiTools.DrawVLine(FBuffer, TGuiTools.DrawVLine(FBuffer,
TabRect.Right - TabCornerRadius + 1, TabRect.Right - TabCornerRadius + 1,
TabRect.top + TabCornerRadius, TabRect.top + TabCornerRadius,
@ -1521,19 +1538,20 @@ procedure TSpkToolbar.ValidateBuffer;
TGuiTools.DrawAARoundCorner(FBuffer, TGuiTools.DrawAARoundCorner(FBuffer,
{$IFDEF EnhancedRecordSupport} {$IFDEF EnhancedRecordSupport}
T2DIntPoint.Create(TabRect.left + TabCornerRadius - 1, 0), T2DIntPoint.Create(TabRect.Left + TabCornerRadius - 1, 0),
{$ELSE} {$ELSE}
Create2DIntPoint(TabRect.left + TabCornerRadius - 1, 0), Create2DIntPoint(TabRect.Left + TabCornerRadius - 1, 0),
{$ENDIF} {$ENDIF}
TabCornerRadius, TabCornerRadius,
cpLeftTop, cpLeftTop,
Border, Border,
FTabClipRect); FTabClipRect);
TGuiTools.DrawAARoundCorner(FBuffer, TGuiTools.DrawAARoundCorner(FBuffer,
{$IFDEF EnhancedRecordSupport} {$IFDEF EnhancedRecordSupport}
T2DIntPoint.Create(TabRect.right - 2 * TabCornerRadius + 2, 0), T2DIntPoint.Create(TabRect.Right - 2 * TabCornerRadius + 2, 0),
{$ELSE} {$ELSE}
Create2DIntPoint(TabRect.right - 2 * TabCornerRadius + 2, 0), Create2DIntPoint(TabRect.Right - 2 * TabCornerRadius + 2, 0),
{$ENDIF} {$ENDIF}
TabCornerRadius, TabCornerRadius,
cpRightTop, cpRightTop,
@ -1541,8 +1559,8 @@ procedure TSpkToolbar.ValidateBuffer;
FTabClipRect); FTabClipRect);
TGuiTools.DrawHLine(FBuffer, TGuiTools.DrawHLine(FBuffer,
TabRect.left + 2 * TabCornerRadius - 1, TabRect.Left + 2 * TabCornerRadius - 1,
TabRect.right - 2 * TabCornerRadius + 2, TabRect.Right - 2 * TabCornerRadius + 2,
0, 0,
Border, Border,
FTabClipRect); FTabClipRect);
@ -1563,6 +1581,8 @@ procedure TSpkToolbar.ValidateBuffer;
FTabClipRect); FTabClipRect);
end; end;
var
delta: Integer;
begin begin
//I assume that the tabs size is reasonable //I assume that the tabs size is reasonable
@ -1588,6 +1608,10 @@ procedure TSpkToolbar.ValidateBuffer;
else else
CurrentAppearance := FAppearance; CurrentAppearance := FAppearance;
if CurrentAppearance.Tab.GradientType = bkSolid then
delta := 0 else
delta := 50;
TabRect := FTabRects[i]; TabRect := FTabRects[i];
// Tab is drawn // Tab is drawn
@ -1598,18 +1622,16 @@ procedure TSpkToolbar.ValidateBuffer;
DrawTab(i, DrawTab(i,
CurrentAppearance.Tab.BorderColor, CurrentAppearance.Tab.BorderColor,
TColorTools.Brighten(TColorTools.Brighten( TColorTools.Brighten(TColorTools.Brighten(
CurrentAppearance.Tab.GradientFromColor, 50), 50), CurrentAppearance.Tab.GradientFromColor, delta), delta),
CurrentAppearance.Tab.GradientFromColor, CurrentAppearance.Tab.GradientFromColor);
CurrentAppearance.Tab.TabHeaderFont.Color);
end end
else else
begin begin
DrawTab(i, DrawTab(i,
CurrentAppearance.Tab.BorderColor, CurrentAppearance.Tab.BorderColor,
TColorTools.Brighten( TColorTools.Brighten(
CurrentAppearance.Tab.GradientFromColor, 50), CurrentAppearance.Tab.GradientFromColor, delta),
CurrentAppearance.Tab.GradientFromColor, CurrentAppearance.Tab.GradientFromColor);
CurrentAppearance.Tab.TabHeaderFont.color);
end; end;
DrawTabText(i, CurrentAppearance.Tab.TabHeaderFont); DrawTabText(i, CurrentAppearance.Tab.TabHeaderFont);
@ -1620,12 +1642,11 @@ procedure TSpkToolbar.ValidateBuffer;
begin begin
DrawTab(i, DrawTab(i,
TColorTools.Shade( TColorTools.Shade(
self.Color, CurrentAppearance.Tab.BorderColor, 50), self.Color, CurrentAppearance.Tab.BorderColor, delta),
TColorTools.Shade(self.color, TColorTools.brighten( TColorTools.Shade(self.color,
CurrentAppearance.Tab.GradientFromColor, 50), 50), TColorTools.Brighten(CurrentAppearance.Tab.GradientFromColor, delta), 50),
TColorTools.Shade( TColorTools.Shade(
self.color, CurrentAppearance.Tab.GradientFromColor, 50), self.color, CurrentAppearance.Tab.GradientFromColor, 50) );
CurrentAppearance.Tab.TabHeaderFont.color);
end; end;
// Bottom line // Bottom line

1
components/spktoolbar/SpkToolbar/spkt_Pane.pas
View File

@ -232,6 +232,7 @@ var
i: Integer; i: Integer;
R: T2DIntRect; R: T2DIntRect;
delta: Integer; delta: Integer;
cornerRadius: Integer;
begin begin
// W niektórych warunkach nie jesteœmy w stanie rysowaæ: // W niektórych warunkach nie jesteœmy w stanie rysowaæ:
// * Brak dyspozytora // * Brak dyspozytora

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

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

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

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