GitHub-Mirror/x2cl
1
0
Fork 0
mirror of synced 2024-11-05 03:09:15 +00:00
Code Issues Projects Releases Wiki Activity

Added: ImageOffsetX/Y to unaMenuBarPainter

Browse Source
This commit is contained in:
Mark van Renswoude 2008-05-26 10:22:50 +00:00
parent 670eb4baa5
commit 280e5f669b
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/X2CLMenuBar.pas
View File

@ -419,6 +419,7 @@ type
FHideScrollbar: Boolean;
FGroups: TX2MenuBarGroups;
FImages: TCustomImageList;
FImagesChangeLink: TChangeLink;
FOnCollapsed: TX2MenuBarExpandedEvent;
FOnCollapsing: TX2MenuBarExpandingEvent;
FOnExpanded: TX2MenuBarExpandedEvent;
@ -455,6 +456,7 @@ type
procedure GroupsNotify(Sender: TObject; Item: TCollectionItem; Action: TCollectionNotification);
procedure GroupsUpdate(Sender: TObject; Item: TCollectionItem);
procedure UpdateScrollbar();
procedure ImagesChange(Sender: TObject);
procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
@ -1400,8 +1402,11 @@ begin
FGroups.OnNotify := GroupsNotify;
FGroups.OnUpdate := GroupsUpdate;
FHideScrollbar := True;
FImagesChangeLink := TChangeLink.Create();
FScrollbar := True;
TabStop := True;
FImagesChangeLink.OnChange := ImagesChange;
end;
@ -1437,11 +1442,13 @@ end;
destructor TX2CustomMenuBar.Destroy();
begin
Images := nil;
Painter := nil;
FreeAndNil(FGroups);
FreeAndNil(FBuffer);
FreeAndNil(FActionQueue);
FreeAndNil(FImagesChangeLink);
inherited;
end;
@ -1452,6 +1459,7 @@ begin
Msg.Result := 0;
end;
procedure TX2CustomMenuBar.Paint();
var
bufferRect: TRect;
@ -2844,6 +2852,12 @@ begin
end;
procedure TX2CustomMenuBar.ImagesChange(Sender: TObject);
begin
Invalidate();
end;
procedure TX2CustomMenuBar.SetAllowCollapseAll(const Value: Boolean);
begin
if Value <> FAllowCollapseAll then
@ -2910,12 +2924,18 @@ begin
if Value <> FImages then
begin
if Assigned(FImages) then
begin
FImages.UnRegisterChanges(FImagesChangeLink);
FImages.RemoveFreeNotification(Self);
end;
FImages := Value;
if Assigned(FImages) then
begin
FImages.FreeNotification(Self);
FImages.RegisterChanges(FImagesChangeLink);
end;
Invalidate();
end;

34
Source/X2CLunaMenuBarPainter.pas
View File

@ -96,6 +96,8 @@ type
FGroupHeight: Integer;
FItemHeight: Integer;
FMargin: Integer;
FImageOffsetY: Integer;
FImageOffsetX: Integer;
procedure SetAfterGroupHeader(const Value: Integer);
procedure SetAfterItem(const Value: Integer);
@ -106,6 +108,8 @@ type
procedure SetGroupHeight(const Value: Integer);
procedure SetItemHeight(const Value: Integer);
procedure SetMargin(const Value: Integer);
procedure SetImageOffsetX(const Value: Integer);
procedure SetImageOffsetY(const Value: Integer);
public
constructor Create();
@ -120,6 +124,8 @@ type
property GroupHeight: Integer read FGroupHeight write SetGroupHeight default 22;
property ItemHeight: Integer read FItemHeight write SetItemHeight default 21;
property Margin: Integer read FMargin write SetMargin default 10;
property ImageOffsetX: Integer read FImageOffsetX write SetImageOffsetX default 0;
property ImageOffsetY: Integer read FImageOffsetY write SetImageOffsetY default 0;
end;
TX2MenuBarunaPainter = class(TX2CustomMenuBarPainter)
@ -387,6 +393,26 @@ begin
end;
procedure TX2MenuBarunaMetrics.SetImageOffsetX(const Value: Integer);
begin
if Value <> FImageOffsetX then
begin
FImageOffsetX := Value;
Changed();
end;
end;
procedure TX2MenuBarunaMetrics.SetImageOffsetY(const Value: Integer);
begin
if Value <> FImageOffsetY then
begin
FImageOffsetY := Value;
Changed();
end;
end;
{ TX2MenuBarunaPainter }
constructor TX2MenuBarunaPainter.Create(AOwner: TComponent);
begin
@ -576,6 +602,10 @@ begin
begin
imagePos.X := textRect.Left;
imagePos.Y := ABounds.Top + ((ABounds.Bottom - ABounds.Top - imageList.Height) div 2);
Inc(imagePos.X, Metrics.ImageOffsetX);
Inc(imagePos.Y, Metrics.ImageOffsetY);
imageList.Draw(ACanvas, imagePos.X, imagePos.Y, AGroup.ImageIndex);
end;
@ -584,6 +614,7 @@ begin
{ Text }
ACanvas.Font.Style := [fsBold];
SetBkMode(ACanvas.Handle, TRANSPARENT);
DrawText(ACanvas, AGroup.Caption, textRect, taLeftJustify, taVerticalCenter,
False, csEllipsis);
end;
@ -637,14 +668,13 @@ begin
Inc(textBounds.Left, 4);
Dec(textBounds.Right, 4);
SetBkMode(ACanvas.Handle, TRANSPARENT);
if not AItem.Visible then
{ Design-time }
ACanvas.Font.Style := [fsItalic]
else
ACanvas.Font.Style := [];
SetBkMode(ACanvas.Handle, TRANSPARENT);
DrawText(ACanvas, AItem.Caption, textBounds, taRightJustify, taVerticalCenter,
False, csEllipsis);
end;