mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-06 02:18:03 +02:00
LCL: add support for image list to TSpeedButton and TBitBtn. Issue #33645
git-svn-id: trunk@57695 -
This commit is contained in:
ondrej
parent
70b3acf581
commit
135231e273
@ -74,13 +74,20 @@ type
|
||||
FShowMode: TGlyphShowMode;
|
||||
FImageIndexes: array[TButtonState] of Integer;
|
||||
FImages: TCustomImageList;
|
||||
FExternalImages: TCustomImageList;
|
||||
FExternalImageIndex: Integer;
|
||||
FExternalImageWidth: Integer;
|
||||
FOriginal: TBitmap;
|
||||
FNumGlyphs: TNumGlyphs;
|
||||
FOnChange: TNotifyEvent;
|
||||
FImagesCache: TImageListCache;
|
||||
FTransparentMode: TGlyphTransparencyMode; // set by our owner to indicate that the glyphbitmap should be transparent
|
||||
function GetHeight: Integer;
|
||||
function GetNumGlyphs: TNumGlyphs;
|
||||
function GetWidth: Integer;
|
||||
procedure SetExternalImageIndex(const AExternalImageIndex: Integer);
|
||||
procedure SetExternalImages(const AExternalImages: TCustomImageList);
|
||||
procedure SetExternalImageWidth(const AExternalImageWidth: Integer);
|
||||
procedure SetGlyph(Value: TBitmap);
|
||||
procedure SetNumGlyphs(Value: TNumGlyphs);
|
||||
procedure SetShowMode(const AValue: TGlyphShowMode);
|
||||
@ -94,6 +101,7 @@ type
|
||||
procedure CacheSetImageList(AImageList: TCustomImageList);
|
||||
procedure CacheSetImageIndex(AIndex, AImageIndex: Integer);
|
||||
protected
|
||||
procedure DoChange; virtual;
|
||||
procedure GlyphChanged(Sender: TObject);
|
||||
procedure SetTransparentMode(AValue: TGlyphTransparencyMode);
|
||||
|
||||
@ -101,15 +109,25 @@ type
|
||||
public
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
procedure GetImageIndexAndEffect(State: TButtonState; out AIndex: Integer; out AEffect: TGraphicsDrawEffect);
|
||||
// procedure GetImageIndexAndEffect(State: TButtonState; out AIndex: Integer; out AEffect: TGraphicsDrawEffect); To-Do: enable for backwards compatibility
|
||||
procedure GetImageIndexAndEffect(State: TButtonState;
|
||||
APPI: Integer; const ACanvasScaleFactor: Double;
|
||||
out AImageResolution: TScaledImageListResolution;
|
||||
out AIndex: Integer; out AEffect: TGraphicsDrawEffect);
|
||||
{function Draw(Canvas: TCanvas; const Client: TRect; const Offset: TPoint;
|
||||
State: TButtonState; Transparent: Boolean;
|
||||
BiDiFlags: Longint): TRect; To-Do: enable for backwards compatibility }
|
||||
function Draw(Canvas: TCanvas; const Client: TRect; const Offset: TPoint;
|
||||
State: TButtonState; Transparent: Boolean;
|
||||
BiDiFlags: Longint): TRect;
|
||||
BiDiFlags, PPI: Longint; const ScaleFactor: Double): TRect;
|
||||
procedure Refresh;
|
||||
property Glyph: TBitmap read FOriginal write SetGlyph;
|
||||
property IsDesigning: Boolean read FIsDesigning write FIsDesigning;
|
||||
property NumGlyphs: TNumGlyphs read FNumGlyphs write SetNumGlyphs;
|
||||
property NumGlyphs: TNumGlyphs read GetNumGlyphs write SetNumGlyphs;
|
||||
property Images: TCustomImageList read FImages;
|
||||
property ExternalImages: TCustomImageList read FExternalImages write SetExternalImages;
|
||||
property ExternalImageIndex: Integer read FExternalImageIndex write SetExternalImageIndex;
|
||||
property ExternalImageWidth: Integer read FExternalImageWidth write SetExternalImageWidth;
|
||||
property Width: Integer read GetWidth;
|
||||
property Height: Integer read GetHeight;
|
||||
property ShowMode: TGlyphShowMode read FShowMode write SetShowMode;
|
||||
@ -133,9 +151,11 @@ type
|
||||
FLayout: TButtonLayout;
|
||||
FMargin: integer;
|
||||
FSpacing: Integer;
|
||||
FImageChangeLink: TChangeLink;
|
||||
function GetGlyph: TBitmap;
|
||||
function GetGlyphShowMode: TGlyphShowMode;
|
||||
function GetNumGlyphs: Integer;
|
||||
procedure ImageListChange(Sender: TObject);
|
||||
function IsGlyphStored: Boolean;
|
||||
procedure SetGlyph(AValue: TBitmap);
|
||||
procedure SetGlyphShowMode(const AValue: TGlyphShowMode);
|
||||
@ -147,6 +167,12 @@ type
|
||||
procedure RealizeKind;
|
||||
//Return the caption associated with the aKind value.
|
||||
function GetCaptionOfKind(AKind: TBitBtnKind): String;
|
||||
function GetImages: TCustomImageList;
|
||||
procedure SetImages(const aImages: TCustomImageList);
|
||||
function GetImageIndex: Integer;
|
||||
procedure SetImageIndex(const aImageIndex: Integer);
|
||||
function GetImageWidth: Integer;
|
||||
procedure SetImageWidth(const aImageWidth: Integer);
|
||||
protected
|
||||
FButtonGlyph: TButtonGlyph;
|
||||
class procedure WSRegisterClass; override;
|
||||
@ -155,6 +181,8 @@ type
|
||||
procedure InitializeWnd; override;
|
||||
function IsCaptionStored: Boolean;
|
||||
procedure Loaded; override;
|
||||
procedure Notification(AComponent: TComponent;
|
||||
Operation: TOperation); override;
|
||||
procedure TextChanged; override;
|
||||
class function GetControlClassDefaultSize: TSize; override;
|
||||
procedure CMAppShowBtnGlyphChanged(var Message: TLMessage); message CM_APPSHOWBTNGLYPHCHANGED;
|
||||
@ -171,6 +199,9 @@ type
|
||||
property DefaultCaption: Boolean read FDefaultCaption write FDefaultCaption default False;
|
||||
property Glyph: TBitmap read GetGlyph write SetGlyph stored IsGlyphStored;
|
||||
property NumGlyphs: Integer read GetNumGlyphs write SetNumGlyphs default 1;
|
||||
property Images: TCustomImageList read GetImages write SetImages;
|
||||
property ImageIndex: Integer read GetImageIndex write SetImageIndex;
|
||||
property ImageWidth: Integer read GetImageWidth write SetImageWidth;
|
||||
property Kind: TBitBtnKind read FKind write SetKind default bkCustom;
|
||||
property Layout: TButtonLayout read FLayout write SetLayout default blGlyphLeft;
|
||||
property Margin: integer read FMargin write SetMargin default -1;
|
||||
@ -257,6 +288,7 @@ type
|
||||
private
|
||||
FGlyph: TButtonGlyph;
|
||||
FGroupIndex: Integer;
|
||||
FImageChangeLink: TChangeLink;
|
||||
FLastDrawDetails: TThemedElementDetails;
|
||||
FLayout: TButtonLayout;
|
||||
FMargin: integer;
|
||||
@ -271,6 +303,7 @@ type
|
||||
FFlat: Boolean;
|
||||
FMouseInControl: Boolean;
|
||||
function GetGlyph: TBitmap;
|
||||
procedure ImageListChange(Sender: TObject);
|
||||
function IsGlyphStored: Boolean;
|
||||
procedure SetShowCaption(const AValue: boolean);
|
||||
procedure UpdateExclusive;
|
||||
@ -287,6 +320,12 @@ type
|
||||
procedure WMLButtonDown(Var Message: TLMLButtonDown); message LM_LBUTTONDOWN;
|
||||
procedure WMLButtonUp(var Message: TLMLButtonUp); message LM_LBUTTONUP;
|
||||
procedure WMLButtonDBLCLK(Var Message: TLMLButtonDblClk); message LM_LBUTTONDBLCLK;
|
||||
function GetImages: TCustomImageList;
|
||||
procedure SetImages(const aImages: TCustomImageList);
|
||||
function GetImageIndex: Integer;
|
||||
procedure SetImageIndex(const aImageIndex: Integer);
|
||||
function GetImageWidth: Integer;
|
||||
procedure SetImageWidth(const aImageWidth: Integer);
|
||||
protected
|
||||
FState: TButtonState;
|
||||
class procedure WSRegisterClass; override;
|
||||
@ -304,6 +343,8 @@ type
|
||||
procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
|
||||
procedure MouseUp(Button: TMouseButton; Shift: TShiftState;
|
||||
X, Y: Integer); override;
|
||||
procedure Notification(AComponent: TComponent;
|
||||
Operation: TOperation); override;
|
||||
procedure Paint; override;
|
||||
procedure PaintBackground(var PaintRect: TRect); virtual;
|
||||
procedure SetDown(Value: Boolean);
|
||||
@ -339,6 +380,9 @@ type
|
||||
property Flat: Boolean read FFlat write SetFlat default false;
|
||||
property Glyph: TBitmap read GetGlyph write SetGlyph stored IsGlyphStored;
|
||||
property GroupIndex: Integer read FGroupIndex write SetGroupIndex default 0;
|
||||
property Images: TCustomImageList read GetImages write SetImages;
|
||||
property ImageIndex: Integer read GetImageIndex write SetImageIndex;
|
||||
property ImageWidth: Integer read GetImageWidth write SetImageWidth;
|
||||
property Layout: TButtonLayout read FLayout write SetLayout default blGlyphLeft;
|
||||
property Margin: integer read FMargin write SetMargin default -1;
|
||||
property NumGlyphs: Integer read GetNumGlyphs write SetNumGlyphs default 1;
|
||||
|
||||
@ -25,6 +25,8 @@ begin
|
||||
FButtonGlyph.NumGlyphs := 1;
|
||||
FButtonGlyph.OnChange := @GlyphChanged;
|
||||
FButtonGlyph.IsDesigning := csDesigning in ComponentState;
|
||||
FImageChangeLink := TChangeLink.Create;
|
||||
FImageChangeLink.OnChange := @ImageListChange;
|
||||
Align := alNone;
|
||||
RealizeKind;
|
||||
end;
|
||||
@ -35,6 +37,7 @@ end;
|
||||
destructor TCustomBitBtn.Destroy;
|
||||
begin
|
||||
FreeThenNil(FButtonGlyph);
|
||||
FreeAndNil(FImageChangeLink);
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
@ -80,9 +83,19 @@ begin
|
||||
Buttons.LoadGlyphFromStock(FButtonGlyph, idButton);
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.Notification(AComponent: TComponent;
|
||||
Operation: TOperation);
|
||||
begin
|
||||
inherited Notification(AComponent, Operation);
|
||||
if (Operation = opRemove) and (AComponent = FButtonGlyph.ExternalImages) then
|
||||
Images := nil;
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.CanShowGlyph: Boolean;
|
||||
begin
|
||||
Result := not Glyph.Empty and (FButtonGlyph.Images <> nil);
|
||||
Result :=
|
||||
(not Glyph.Empty and (FButtonGlyph.Images <> nil))
|
||||
or ((FButtonGlyph.ExternalImages <> nil) and (FButtonGlyph.ExternalImageIndex > -1));
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.GetGlyph : TBitmap;
|
||||
@ -95,6 +108,21 @@ begin
|
||||
Result := FButtonGlyph.ShowMode;
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.GetImageIndex: Integer;
|
||||
begin
|
||||
Result := FButtonGlyph.ExternalImageIndex;
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.GetImages: TCustomImageList;
|
||||
begin
|
||||
Result := FButtonGlyph.ExternalImages;
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.GetImageWidth: Integer;
|
||||
begin
|
||||
Result := FButtonGlyph.ExternalImageWidth;
|
||||
end;
|
||||
|
||||
function TCustomBitBtn.GetNumGlyphs: Integer;
|
||||
begin
|
||||
Result := FButtonGlyph.FNumGlyphs;
|
||||
@ -129,6 +157,31 @@ begin
|
||||
FButtonGlyph.ShowMode := AValue;
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.SetImageIndex(const aImageIndex: Integer);
|
||||
begin
|
||||
FButtonGlyph.ExternalImageIndex := aImageIndex;
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.SetImages(const aImages: TCustomImageList);
|
||||
begin
|
||||
if FButtonGlyph.ExternalImages <> nil then
|
||||
begin
|
||||
FButtonGlyph.ExternalImages.UnRegisterChanges(FImageChangeLink);
|
||||
FButtonGlyph.ExternalImages.RemoveFreeNotification(Self);
|
||||
end;
|
||||
FButtonGlyph.ExternalImages := aImages;
|
||||
if FButtonGlyph.ExternalImages <> nil then
|
||||
begin
|
||||
FButtonGlyph.ExternalImages.FreeNotification(Self);
|
||||
FButtonGlyph.ExternalImages.RegisterChanges(FImageChangeLink);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.SetImageWidth(const aImageWidth: Integer);
|
||||
begin
|
||||
FButtonGlyph.ExternalImageWidth := aImageWidth;
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.GlyphChanged(Sender: TObject);
|
||||
begin
|
||||
if HandleAllocated then
|
||||
@ -137,6 +190,12 @@ begin
|
||||
AdjustSize;
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.ImageListChange(Sender: TObject);
|
||||
begin
|
||||
if Sender = Images then
|
||||
GlyphChanged(Sender);
|
||||
end;
|
||||
|
||||
procedure TCustomBitBtn.ActionChange(Sender: TObject; CheckDefaults: Boolean);
|
||||
begin
|
||||
inherited ActionChange(Sender,CheckDefaults);
|
||||
|
||||
@ -84,36 +84,71 @@ begin
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
procedure TButtonGlyph.DoChange;
|
||||
begin
|
||||
if Assigned(FOnChange) then
|
||||
FOnChange(Self);
|
||||
end;
|
||||
|
||||
procedure TButtonGlyph.GetImageIndexAndEffect(State: TButtonState;
|
||||
out AIndex: Integer; out AEffect: TGraphicsDrawEffect);
|
||||
APPI: Integer; const ACanvasScaleFactor: Double; out
|
||||
AImageResolution: TScaledImageListResolution; out AIndex: Integer; out
|
||||
AEffect: TGraphicsDrawEffect);
|
||||
var
|
||||
AStoredState: TButtonState;
|
||||
AUseAutoEffects: Integer;
|
||||
AImages: TCustomImageList;
|
||||
const
|
||||
CEffects: array[Boolean, TButtonState] of TGraphicsDrawEffect =
|
||||
((gdeNormal, gdeDisabled, gdeNormal, gdeNormal, gdeNormal),
|
||||
(gdeNormal, gdeDisabled, gdeShadowed, gdeNormal, gdeHighlighted));
|
||||
begin
|
||||
AStoredState := bsUp;
|
||||
AEffect := gdeNormal;
|
||||
AUseAutoEffects := ThemeServices.GetOption(toUseGlyphEffects);
|
||||
case State of
|
||||
bsDisabled:
|
||||
if NumGlyphs > 1 then
|
||||
AStoredState := State
|
||||
else
|
||||
AEffect := gdeDisabled;
|
||||
bsDown:
|
||||
if NumGlyphs > 2 then
|
||||
AStoredState := State
|
||||
else if AUseAutoEffects > 0 then
|
||||
AEffect := gdeShadowed;
|
||||
bsExclusive:
|
||||
if NumGlyphs > 3 then
|
||||
AStoredState := State;
|
||||
bsHot:
|
||||
if NumGlyphs > 4 then
|
||||
AStoredState := State
|
||||
else if AUseAutoEffects > 0 then
|
||||
AEffect := gdeHighlighted;
|
||||
if Assigned(FExternalImages) then
|
||||
begin
|
||||
AImages := FExternalImages;
|
||||
AIndex := FExternalImageIndex;
|
||||
AEffect := CEffects[AUseAutoEffects > 0, State];
|
||||
AImageResolution := AImages.ResolutionForPPI[FExternalImageWidth, APPI, ACanvasScaleFactor];
|
||||
end else
|
||||
begin
|
||||
AImages := FImages;
|
||||
if AImages<>nil then
|
||||
AImageResolution := AImages.ResolutionForPPI[0, 96, 1]
|
||||
else
|
||||
AImageResolution := TScaledImageListResolution.Create(nil, 1);
|
||||
AStoredState := bsUp;
|
||||
AEffect := gdeNormal;
|
||||
case State of
|
||||
bsDisabled:
|
||||
if NumGlyphs > 1 then
|
||||
AStoredState := State
|
||||
else
|
||||
AEffect := gdeDisabled;
|
||||
bsDown:
|
||||
if NumGlyphs > 2 then
|
||||
AStoredState := State
|
||||
else if AUseAutoEffects > 0 then
|
||||
AEffect := gdeShadowed;
|
||||
bsExclusive:
|
||||
if NumGlyphs > 3 then
|
||||
AStoredState := State;
|
||||
bsHot:
|
||||
if NumGlyphs > 4 then
|
||||
AStoredState := State
|
||||
else if AUseAutoEffects > 0 then
|
||||
AEffect := gdeHighlighted;
|
||||
end;
|
||||
AIndex := FImageIndexes[AStoredState];
|
||||
end;
|
||||
AIndex := FImageIndexes[AStoredState];
|
||||
end;
|
||||
|
||||
function TButtonGlyph.GetNumGlyphs: TNumGlyphs;
|
||||
begin
|
||||
if Assigned(FExternalImages) then
|
||||
Result := 1
|
||||
else
|
||||
Result := FNumGlyphs;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
@ -218,17 +253,17 @@ begin
|
||||
end;
|
||||
|
||||
if Sender = FOriginal then
|
||||
if Assigned(FOnChange) then
|
||||
FOnChange(Self);
|
||||
DoChange;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
TButtonGlyph Draw
|
||||
------------------------------------------------------------------------------}
|
||||
function TButtonGlyph.Draw(Canvas: TCanvas; const Client: TRect;
|
||||
const Offset: TPoint; State: TButtonState; Transparent: Boolean;
|
||||
BiDiFlags: Longint): TRect;
|
||||
const Offset: TPoint; State: TButtonState; Transparent: Boolean; BiDiFlags,
|
||||
PPI: Longint; const ScaleFactor: Double): TRect;
|
||||
var
|
||||
ImgRes: TScaledImageListResolution;
|
||||
ImgID: integer;
|
||||
AEffect: TGraphicsDrawEffect;
|
||||
begin
|
||||
@ -236,14 +271,15 @@ begin
|
||||
if (FOriginal = nil) then
|
||||
exit;
|
||||
|
||||
if (Width = 0) or (Height = 0) or
|
||||
(Client.Left >= Client.Right) or (Client.Top >= Client.Bottom) then
|
||||
if (Client.Left >= Client.Right) or (Client.Top >= Client.Bottom) then
|
||||
Exit;
|
||||
|
||||
GetImageIndexAndEffect(State, ImgID, AEffect);
|
||||
GetImageIndexAndEffect(State, PPI, ScaleFactor, ImgRes, ImgID, AEffect);
|
||||
if (ImgRes.Resolution=nil) or (ImgID<0) then
|
||||
Exit;
|
||||
|
||||
FImages.Draw(Canvas, Client.Left + Offset.X, Client.Top + Offset.y, ImgID,
|
||||
AEffect);
|
||||
ImgRes.Resolution.Draw(Canvas,
|
||||
Client.Left + Offset.X, Client.Top + Offset.y, ImgID, AEffect);
|
||||
|
||||
// ToDo: VCL returns the text rectangle
|
||||
end;
|
||||
@ -253,6 +289,29 @@ begin
|
||||
GlyphChanged(FOriginal);
|
||||
end;
|
||||
|
||||
procedure TButtonGlyph.SetExternalImageIndex(const AExternalImageIndex: Integer);
|
||||
begin
|
||||
if FExternalImageIndex = AExternalImageIndex then Exit;
|
||||
FExternalImageIndex := AExternalImageIndex;
|
||||
DoChange;
|
||||
end;
|
||||
|
||||
procedure TButtonGlyph.SetExternalImages(const AExternalImages: TCustomImageList
|
||||
);
|
||||
begin
|
||||
if FExternalImages = AExternalImages then Exit;
|
||||
FExternalImages := AExternalImages;
|
||||
DoChange;
|
||||
end;
|
||||
|
||||
procedure TButtonGlyph.SetExternalImageWidth(const AExternalImageWidth: Integer
|
||||
);
|
||||
begin
|
||||
if FExternalImageWidth = AExternalImageWidth then Exit;
|
||||
FExternalImageWidth := AExternalImageWidth;
|
||||
DoChange;
|
||||
end;
|
||||
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
TButtonGlyph SetNumGlyphs
|
||||
|
||||
@ -40,6 +40,8 @@ begin
|
||||
FGlyph.ShowMode := gsmAlways;
|
||||
FGlyph.SetTransparentMode(gtmTransparent);
|
||||
FGlyph.OnChange := @GlyphChanged;
|
||||
FImageChangeLink := TChangeLink.Create;
|
||||
FImageChangeLink.OnChange := @ImageListChange;
|
||||
|
||||
with GetControlClassDefaultSize do
|
||||
SetInitialBounds(0, 0, CX, CY);
|
||||
@ -66,6 +68,7 @@ end;
|
||||
destructor TCustomSpeedButton.Destroy;
|
||||
begin
|
||||
FreeAndNil(FGlyph);
|
||||
FreeAndNil(FImageChangeLink);
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
||||
@ -208,6 +211,31 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCustomSpeedButton.SetImageIndex(const aImageIndex: Integer);
|
||||
begin
|
||||
FGlyph.ExternalImageIndex := aImageIndex;
|
||||
end;
|
||||
|
||||
procedure TCustomSpeedButton.SetImages(const aImages: TCustomImageList);
|
||||
begin
|
||||
if FGlyph.ExternalImages <> nil then
|
||||
begin
|
||||
FGlyph.ExternalImages.UnRegisterChanges(FImageChangeLink);
|
||||
FGlyph.ExternalImages.RemoveFreeNotification(Self);
|
||||
end;
|
||||
FGlyph.ExternalImages := aImages;
|
||||
if FGlyph.ExternalImages <> nil then
|
||||
begin
|
||||
FGlyph.ExternalImages.FreeNotification(Self);
|
||||
FGlyph.ExternalImages.RegisterChanges(FImageChangeLink);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCustomSpeedButton.SetImageWidth(const aImageWidth: Integer);
|
||||
begin
|
||||
FGlyph.ExternalImageWidth := aImageWidth;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
Method: TCustomSpeedButton.SetMargin
|
||||
Params: Value:
|
||||
@ -488,6 +516,11 @@ Begin
|
||||
Invalidate;
|
||||
end;
|
||||
|
||||
procedure TCustomSpeedButton.ImageListChange(Sender: TObject);
|
||||
begin
|
||||
if Sender = Images then Invalidate;
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.DialogChar(var Message: TLMKey): boolean;
|
||||
begin
|
||||
Result := False;
|
||||
@ -823,6 +856,14 @@ begin
|
||||
inherited MouseUp(Button, Shift, X, Y);
|
||||
end;
|
||||
|
||||
procedure TCustomSpeedButton.Notification(AComponent: TComponent;
|
||||
Operation: TOperation);
|
||||
begin
|
||||
inherited Notification(AComponent, Operation);
|
||||
if (Operation = opRemove) and (AComponent = FGlyph.ExternalImages) then
|
||||
Images := nil;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
TCustomSpeedButton DoMouseUp "Event Handler"
|
||||
------------------------------------------------------------------------------}
|
||||
@ -1001,9 +1042,37 @@ begin
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.GetGlyphSize(Drawing: boolean; PaintRect: TRect): TSize;
|
||||
var
|
||||
AImageRes: TScaledImageListResolution;
|
||||
AIndex: Integer;
|
||||
AEffect: TGraphicsDrawEffect;
|
||||
begin
|
||||
Result.CX := FGlyph.Glyph.Width;
|
||||
Result.CY := FGlyph.Glyph.Height;
|
||||
if FGlyph.ExternalImages<>nil then
|
||||
begin
|
||||
FGlyph.GetImageIndexAndEffect(Low(TButtonState), Font.PixelsPerInch,
|
||||
GetCanvasScaleFactor, AImageRes, AIndex, AEffect);
|
||||
Result.CX := AImageRes.Width;
|
||||
Result.CY := AImageRes.Height;
|
||||
end else
|
||||
begin
|
||||
Result.CX := FGlyph.Width;
|
||||
Result.CY := FGlyph.Height;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.GetImageIndex: Integer;
|
||||
begin
|
||||
Result := FGlyph.ExternalImageIndex;
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.GetImages: TCustomImageList;
|
||||
begin
|
||||
Result := FGlyph.ExternalImages;
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.GetImageWidth: Integer;
|
||||
begin
|
||||
Result := FGlyph.ExternalImageWidth;
|
||||
end;
|
||||
|
||||
function TCustomSpeedButton.GetTextSize(Drawing: boolean; PaintRect: TRect): TSize;
|
||||
@ -1051,7 +1120,8 @@ function TCustomSpeedButton.DrawGlyph(ACanvas: TCanvas; const AClient: TRect;
|
||||
BiDiFlags: Longint): TRect;
|
||||
begin
|
||||
if Assigned(FGlyph) then
|
||||
Result := FGlyph.Draw(ACanvas, AClient, AOffset, AState, ATransparent, BiDiFlags)
|
||||
Result := FGlyph.Draw(ACanvas, AClient, AOffset, AState, ATransparent, BiDiFlags,
|
||||
Font.PixelsPerInch, GetCanvasScaleFactor)
|
||||
else
|
||||
Result := Rect(0,0,0,0);
|
||||
end;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user