Skip to content
Permalink
Browse files

Reapply image list fix for extra space besides top items in main menu…

…, after form translation has taken place
  • Loading branch information...
ansgarbecker committed Jul 23, 2019
1 parent db9e76b commit 273be3746990403cd16f7d44f21754a6460841e6
Showing with 17 additions and 6 deletions.
  1. +16 −2 source/extra_controls.pas
  2. +1 −0 source/main.dfm
  3. +0 −4 source/main.pas
@@ -4,7 +4,7 @@ interface

uses
Classes, SysUtils, Forms, Windows, Messages, System.Types, StdCtrls, Clipbrd,
SizeGrip, apphelpers, Vcl.Graphics, Vcl.Dialogs, gnugettext;
SizeGrip, apphelpers, Vcl.Graphics, Vcl.Dialogs, gnugettext, Vcl.ImgList;

type
// Form with a sizegrip in the lower right corner, without the need for a statusbar
@@ -32,11 +32,25 @@ implementation
{ TExtForm }

constructor TExtForm.Create(AOwner: TComponent);
var
OldImageList: TCustomImageList;
begin
inherited;

InheritFont(Font);
HasSizeGrip := False;
TranslateComponent(Self);

// Translation and related fixes
// Issue #557: Apply images *after* translating main menu, so top items don't get unused
// space left besides them.
if (Menu <> nil) and (Menu.Images <> nil) then begin
OldImageList := Menu.Images;
Menu.Images := nil;
TranslateComponent(Self);
Menu.Images := OldImageList;
end else begin
TranslateComponent(Self);
end;
end;


@@ -1985,6 +1985,7 @@ object MainForm: TMainForm
end
object MainMenu1: TMainMenu
AutoHotkeys = maManual
Images = VirtualImageListMain
Left = 424
Top = 152
object MainMenuFile: TMenuItem
@@ -1682,10 +1682,6 @@ procedure TMainForm.FormCreate(Sender: TObject);
// Load preferred ImageCollection into VirtualImageList
PrepareImageList;

// Issue #557: Apply images *after* translating main menu, so top items don't get unused
// space left besides them.
MainMenu1.Images := VirtualImageListMain;

if AppSettings.ReadBool(asToolbarShowCaptions) then begin
for i:=0 to ToolBarMainButtons.ButtonCount-1 do begin
if ToolBarMainButtons.Buttons[i].Style = tbsSeparator then

0 comments on commit 273be37

Please sign in to comment.
You can’t perform that action at this time.