Skip to content

Commit 6abc008

Browse files
ver. 1.5.4
- Added StyledComponents (Rounded Buttons options) - Added init for GDI+Plus to Dll's - Deleted unused images
1 parent 8a9b93a commit 6abc008

27 files changed

+419
-272
lines changed

Ext/StyledComponents/source/Vcl.StyledButton.pas

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ interface
5353
;
5454

5555
const
56-
StyledButtonsVersion = '3.5.1';
56+
StyledButtonsVersion = '3.5.2';
5757

5858
resourcestring
5959
ERROR_SETTING_BUTTON_STYLE = 'Error setting Button Style: %s/%s/%s not available';
@@ -282,6 +282,7 @@ TStyledButtonRender = class(TObject)
282282
procedure SetGroupIndex(const AValue: Integer);
283283
procedure SetShowCaption(const AValue: Boolean);
284284
procedure UpAllButtons;
285+
function GetCaptionToDraw: string;
285286
protected
286287
FCustomDrawType: Boolean;
287288
FUseButtonLayout: Boolean;
@@ -2575,7 +2576,7 @@ procedure TStyledButtonRender.DrawCaptionAndImage(const ACanvas: TCanvas;
25752576
LCaption: TCaption;
25762577
begin
25772578
if FShowCaption then
2578-
LCaption := Caption
2579+
LCaption := GetCaptionToDraw
25792580
else
25802581
LCaption := '';
25812582
case FCaptionAlignment of
@@ -3767,6 +3768,16 @@ function TStyledButtonRender.GetComponentWidth: Integer;
37673768
Result := FOwnerControl.Width;
37683769
end;
37693770

3771+
function TStyledButtonRender.GetCaptionToDraw: string;
3772+
begin
3773+
if FOwnerControl is TCustomStyledGraphicButton then
3774+
Result := TCustomStyledGraphicButton(FOwnerControl).GetCaptionToDraw
3775+
else if FOwnerControl is TCustomStyledButton then
3776+
Result := TCustomStyledButton(FOwnerControl).GetCaptionToDraw
3777+
else
3778+
Result := '';
3779+
end;
3780+
37703781
function TStyledButtonRender.GetComponentHeight: Integer;
37713782
begin
37723783
Result := FOwnerControl.Height;
@@ -3926,7 +3937,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
39263937
inherited Create(AOwner);
39273938
FImageIndex := -1;
39283939
FRender := GetRenderClass.CreateStyled(Self,
3929-
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
3940+
ControlClick, ControlFont, GetCaption, SetCaption,
39303941
GetParentFont, SetParentFont,
39313942
AFamily, AClass, AAppearance,
39323943
_DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
@@ -3950,7 +3961,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
39503961
inherited Create(AOwner);
39513962
FImageIndex := -1;
39523963
FRender := GetRenderClass.CreateStyled(Self,
3953-
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
3964+
ControlClick, ControlFont, GetCaption, SetCaption,
39543965
GetParentFont, SetParentFont,
39553966
AFamily, AClass, AAppearance,
39563967
ADrawType, ACursor, AUseCustomDrawType);
@@ -5074,7 +5085,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
50745085
ParentColor := False;
50755086
FImageIndex := -1;
50765087
FRender := GetRenderClass.CreateStyled(Self,
5077-
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
5088+
ControlClick, ControlFont, GetCaption, SetCaption,
50785089
GetParentFont, SetParentFont,
50795090
AFamily, AClass, AAppearance,
50805091
_DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
@@ -5091,7 +5102,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
50915102
ParentColor := False;
50925103
FImageIndex := -1;
50935104
FRender := GetRenderClass.CreateStyled(Self,
5094-
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
5105+
ControlClick, ControlFont, GetCaption, SetCaption,
50955106
GetParentFont, SetParentFont,
50965107
AFamily, AClass, AAppearance,
50975108
ADrawType, ACursor, AUseCustomDrawType);

Ext/StyledComponents/source/Vcl.StyledToolbar.pas

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ TStyledToolButton = class(TCustomStyledGraphicButton)
113113
function IsStoredStyleClass: Boolean; override;
114114
function IsEnabledStored: Boolean; override;
115115
function IsCaptionStored: Boolean; override;
116-
function GetText: TCaption; override;
117116
function GetImage(out AImageList: TCustomImageList;
118117
out AImageIndex: Integer): Boolean; override;
119118
function GetButtonState: TStyledButtonState; override;
@@ -605,16 +604,6 @@ function TStyledToolButton.GetStyleDrawType: TStyledButtonDrawType;
605604
Result := inherited StyleDrawType;
606605
end;
607606

608-
function TStyledToolButton.GetText: TCaption;
609-
begin
610-
if Assigned(FToolBar) and not (FToolBar.ShowCaptions) then
611-
Result := ''
612-
else if IsSeparator then
613-
Result := ''
614-
else
615-
Result := inherited GetText;
616-
end;
617-
618607
function TStyledToolButton.GetWrap: Boolean;
619608
begin
620609
Result := inherited WordWrap;

Images/Context-Menu.png

-72.6 KB
Binary file not shown.

Images/ExportToPNG.png

-26 KB
Binary file not shown.

Images/SkiaShellExtensions.png

24.6 KB
Loading

Images/lottie_200.png

4.63 KB
Loading

README.htm

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131
</style>
3232
<h1>SKIA Shell Extensions and Lottie Editor <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg" alt="License"/></a></h1>
33-
<p><strong>Latest Version 1.5.3 - 09 May 2024</strong></p>
33+
<p><strong>Latest Version 1.5.4 - 12 May 2024</strong></p>
3434
<p><strong>A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (7, 8, 10 and 11):</strong></p>
3535
<ul>
3636
<li><p>A <a href="https://docs.microsoft.com/en-us/windows/win32/shell/preview-handlers">Preview handler</a> which allows you to see static images and animations files in the &ldquo;Preview Panel&rdquo;.</p>
@@ -97,13 +97,24 @@ <h3>Manual Build and Installation (for Delphi developers)</h3>
9797
</li>
9898
</ol>
9999
<h2>Release Notes</h2>
100-
<p>13 Jan 2024: ver. 1.5.2</p>
100+
<p>12 May 2024: ver. 1.5.4</p>
101+
<ul>
102+
<li>Added StyledComponents (Rounded Buttons options)</li>
103+
<li>Added init for GDI+Plus to Dll's</li>
104+
<li>Deleted unused images</li>
105+
</ul>
106+
<p>09 May 2024: ver. 1.5.3</p>
101107
<ul>
102108
<li>Added File Changed notification and reload</li>
103109
<li>Built with Delphi 12.1</li>
104110
<li>Built with Latest Image32 Library</li>
105111
<li>Built with Latest Skia4Delphi 6.1 Library</li>
106112
</ul>
113+
<p>13 Jan 2024: ver. 1.5.2</p>
114+
<ul>
115+
<li>Aligned to Image32 Library</li>
116+
<li>Updated Copyright</li>
117+
</ul>
107118
<p>26 Oct 2023: ver. 1.5.1</p>
108119
<ul>
109120
<li>Optimized rendering of Icon using the Skia Codec directly</li>

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SKIA Shell Extensions and Lottie Editor [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
22

3-
**Latest Version 1.5.3 - 09 May 2024**
3+
**Latest Version 1.5.4 - 12 May 2024**
44

55
**A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (7, 8, 10 and 11):**
66

@@ -88,6 +88,11 @@ To manually install the SKIAShellExtensions.dll follow these steps:
8888

8989
## Release Notes ##
9090

91+
12 May 2024: ver. 1.5.4
92+
- Added StyledComponents (Rounded Buttons options)
93+
- Added init for GDI+Plus to Dll's
94+
- Deleted unused images
95+
9196
09 May 2024: ver. 1.5.3
9297
- Added File Changed notification and reload
9398
- Built with Delphi 12.1
293 KB
Binary file not shown.

Setup/SKIAShellExtensions.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33
#define MyAppName 'SKIA Shell Extensions and Lottie Text Editor'
4-
#define MyAppVersion '1.5.3'
4+
#define MyAppVersion '1.5.4'
55

66
[Setup]
77
AppName={#MyAppName}

0 commit comments

Comments
 (0)