paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-02 13:00:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 55064 #e4521cc53f from trunk:

Browse Source 
MenuEditor: High-DPI: ShadowMenu. Issue #31877
........

git-svn-id: branches/fixes_1_8@55069 -
This commit is contained in:
maxim 2017-05-23 22:14:55 +00:00
parent 4db7b3a8dd
commit 5ef0d0a44e
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
designer/menueditor.pp
View File

@ -1798,6 +1798,7 @@ constructor TShadowMenu.Create(aDesigner: TMenuDesigner; aForm: TForm;
begin
Assert(aMenu<>nil,'TShadowMenu.Create: TMenu parameter is nil');
inherited Create(nil, aMenu);
InitMenuBaseSizes;
FDesigner := aDesigner;
FMainCanvas := aForm.Canvas;
FInitialSelectedMenuItem := aSelect;

37
designer/menutemplates.pas
View File

@ -11,7 +11,7 @@ uses
// LazUtils
LazFileUtils, Laz2_XMLCfg,
// IdeIntf
IDEDialogs,
IDEDialogs, IDEImagesIntf,
// IDE
LazarusIDEStrConsts, MenuShortcuts;
@ -145,20 +145,22 @@ function GetSavedTemplatesCount: integer;
function InsertMenuTemplateDlg: TMenuItem;
function DeleteMenuTemplateDlg: boolean;
function GetCfgPath: string;
procedure InitMenuBaseSizes;
const
MenuBar_Height = 20;
Separator_Height = 7;
Separator_Centre = 3;
DropDown_Height = 24;
MenuBar_Text_Offset = 7;
Double_MenuBar_Text_Offset = MenuBar_Text_Offset shl 1;
DropDown_Text_Offset = 35;
Double_DropDown_Text_Offset = DropDown_Text_Offset shl 1;
Gutter_Offset = 6;
Gutter_X = DropDown_Text_Offset - Gutter_Offset;
MenuTemplatesFilename = 'menutemplates.xml';
var
MenuBar_Height: Integer = 20;
Separator_Height: Integer = 7;
Separator_Centre: Integer = 3;
DropDown_Height: Integer = 24;
MenuBar_Text_Offset: Integer = 7;
Double_MenuBar_Text_Offset: Integer = 14;
DropDown_Text_Offset: Integer = 35;
Double_DropDown_Text_Offset: Integer = 70;
Gutter_Offset: Integer = 6;
Gutter_X: Integer = 29;
implementation
@ -270,6 +272,19 @@ begin
Result:=ExtractFilePath(ChompPathDelim(GetAppConfigDirUTF8(False)))+'lazarus';
end;
procedure InitMenuBaseSizes;
begin
MenuBar_Height := MulDiv(20, TIDEImages.GetScalePercent, 100);
Separator_Height := MulDiv(7, TIDEImages.GetScalePercent, 100);
Separator_Centre := MulDiv(3, TIDEImages.GetScalePercent, 100);
DropDown_Height := MulDiv(24, TIDEImages.GetScalePercent, 100);
MenuBar_Text_Offset := MulDiv(7, TIDEImages.GetScalePercent, 100);
Double_MenuBar_Text_Offset := MenuBar_Text_Offset shl 1;
DropDown_Text_Offset := MulDiv(35, TIDEImages.GetScalePercent, 100);
Double_DropDown_Text_Offset := DropDown_Text_Offset shl 1;
Gutter_Offset := MulDiv(6, TIDEImages.GetScalePercent, 100);
Gutter_X := DropDown_Text_Offset - Gutter_Offset;
end;
{ TMenuTemplate }