Skip to content

Commit

Permalink
ver. 1.5.4
Browse files Browse the repository at this point in the history
- Added StyledComponents (Rounded Buttons options)
- Added init for GDI+Plus to Dll's
- Deleted unused images
  • Loading branch information
carloBarazzetta committed May 12, 2024
1 parent 8a9b93a commit 6abc008
Show file tree
Hide file tree
Showing 27 changed files with 419 additions and 272 deletions.
23 changes: 17 additions & 6 deletions Ext/StyledComponents/source/Vcl.StyledButton.pas
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ interface
;

const
StyledButtonsVersion = '3.5.1';
StyledButtonsVersion = '3.5.2';

resourcestring
ERROR_SETTING_BUTTON_STYLE = 'Error setting Button Style: %s/%s/%s not available';
Expand Down Expand Up @@ -282,6 +282,7 @@ TStyledButtonRender = class(TObject)
procedure SetGroupIndex(const AValue: Integer);
procedure SetShowCaption(const AValue: Boolean);
procedure UpAllButtons;
function GetCaptionToDraw: string;
protected
FCustomDrawType: Boolean;
FUseButtonLayout: Boolean;
Expand Down Expand Up @@ -2575,7 +2576,7 @@ procedure TStyledButtonRender.DrawCaptionAndImage(const ACanvas: TCanvas;
LCaption: TCaption;
begin
if FShowCaption then
LCaption := Caption
LCaption := GetCaptionToDraw
else
LCaption := '';
case FCaptionAlignment of
Expand Down Expand Up @@ -3767,6 +3768,16 @@ function TStyledButtonRender.GetComponentWidth: Integer;
Result := FOwnerControl.Width;
end;

function TStyledButtonRender.GetCaptionToDraw: string;
begin
if FOwnerControl is TCustomStyledGraphicButton then
Result := TCustomStyledGraphicButton(FOwnerControl).GetCaptionToDraw
else if FOwnerControl is TCustomStyledButton then
Result := TCustomStyledButton(FOwnerControl).GetCaptionToDraw
else
Result := '';
end;

function TStyledButtonRender.GetComponentHeight: Integer;
begin
Result := FOwnerControl.Height;
Expand Down Expand Up @@ -3926,7 +3937,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
inherited Create(AOwner);
FImageIndex := -1;
FRender := GetRenderClass.CreateStyled(Self,
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
ControlClick, ControlFont, GetCaption, SetCaption,
GetParentFont, SetParentFont,
AFamily, AClass, AAppearance,
_DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
Expand All @@ -3950,7 +3961,7 @@ constructor TCustomStyledGraphicButton.CreateStyled(AOwner: TComponent;
inherited Create(AOwner);
FImageIndex := -1;
FRender := GetRenderClass.CreateStyled(Self,
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
ControlClick, ControlFont, GetCaption, SetCaption,
GetParentFont, SetParentFont,
AFamily, AClass, AAppearance,
ADrawType, ACursor, AUseCustomDrawType);
Expand Down Expand Up @@ -5074,7 +5085,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
ParentColor := False;
FImageIndex := -1;
FRender := GetRenderClass.CreateStyled(Self,
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
ControlClick, ControlFont, GetCaption, SetCaption,
GetParentFont, SetParentFont,
AFamily, AClass, AAppearance,
_DefaultStyleDrawType, _DefaultCursor, _UseCustomDrawType);
Expand All @@ -5091,7 +5102,7 @@ constructor TCustomStyledButton.CreateStyled(AOwner: TComponent;
ParentColor := False;
FImageIndex := -1;
FRender := GetRenderClass.CreateStyled(Self,
ControlClick, ControlFont, GetCaptionToDraw, SetCaption,
ControlClick, ControlFont, GetCaption, SetCaption,
GetParentFont, SetParentFont,
AFamily, AClass, AAppearance,
ADrawType, ACursor, AUseCustomDrawType);
Expand Down
11 changes: 0 additions & 11 deletions Ext/StyledComponents/source/Vcl.StyledToolbar.pas
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ TStyledToolButton = class(TCustomStyledGraphicButton)
function IsStoredStyleClass: Boolean; override;
function IsEnabledStored: Boolean; override;
function IsCaptionStored: Boolean; override;
function GetText: TCaption; override;
function GetImage(out AImageList: TCustomImageList;
out AImageIndex: Integer): Boolean; override;
function GetButtonState: TStyledButtonState; override;
Expand Down Expand Up @@ -605,16 +604,6 @@ function TStyledToolButton.GetStyleDrawType: TStyledButtonDrawType;
Result := inherited StyleDrawType;
end;

function TStyledToolButton.GetText: TCaption;
begin
if Assigned(FToolBar) and not (FToolBar.ShowCaptions) then
Result := ''
else if IsSeparator then
Result := ''
else
Result := inherited GetText;
end;

function TStyledToolButton.GetWrap: Boolean;
begin
Result := inherited WordWrap;
Expand Down
Binary file removed Images/Context-Menu.png
Binary file not shown.
Binary file removed Images/ExportToPNG.png
Binary file not shown.
Binary file added Images/SkiaShellExtensions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/lottie_200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions README.htm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
</style>
<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>
<p><strong>Latest Version 1.5.3 - 09 May 2024</strong></p>
<p><strong>Latest Version 1.5.4 - 12 May 2024</strong></p>
<p><strong>A collection of extensions tools for image and animations files, integrated into Microsoft Windows Explorer (7, 8, 10 and 11):</strong></p>
<ul>
<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>
Expand Down Expand Up @@ -97,13 +97,24 @@ <h3>Manual Build and Installation (for Delphi developers)</h3>
</li>
</ol>
<h2>Release Notes</h2>
<p>13 Jan 2024: ver. 1.5.2</p>
<p>12 May 2024: ver. 1.5.4</p>
<ul>
<li>Added StyledComponents (Rounded Buttons options)</li>
<li>Added init for GDI+Plus to Dll's</li>
<li>Deleted unused images</li>
</ul>
<p>09 May 2024: ver. 1.5.3</p>
<ul>
<li>Added File Changed notification and reload</li>
<li>Built with Delphi 12.1</li>
<li>Built with Latest Image32 Library</li>
<li>Built with Latest Skia4Delphi 6.1 Library</li>
</ul>
<p>13 Jan 2024: ver. 1.5.2</p>
<ul>
<li>Aligned to Image32 Library</li>
<li>Updated Copyright</li>
</ul>
<p>26 Oct 2023: ver. 1.5.1</p>
<ul>
<li>Optimized rendering of Icon using the Skia Codec directly</li>
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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)

**Latest Version 1.5.3 - 09 May 2024**
**Latest Version 1.5.4 - 12 May 2024**

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

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

## Release Notes ##

12 May 2024: ver. 1.5.4
- Added StyledComponents (Rounded Buttons options)
- Added init for GDI+Plus to Dll's
- Deleted unused images

09 May 2024: ver. 1.5.3
- Added File Changed notification and reload
- Built with Delphi 12.1
Expand Down
Binary file modified Setup/Output/SKIAShellExtensionsSetup.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion Setup/SKIAShellExtensions.iss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName 'SKIA Shell Extensions and Lottie Text Editor'
#define MyAppVersion '1.5.3'
#define MyAppVersion '1.5.4'

[Setup]
AppName={#MyAppName}
Expand Down
Loading

0 comments on commit 6abc008

Please sign in to comment.