paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-02 18:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

menu designer: reduce changes in the OnPaint event (issue #11190) from Dmitry

Browse Source 
git-svn-id: trunk@19688 -
This commit is contained in:
vincents 2009-04-29 10:01:48 +00:00
parent 76a007d97f
commit a168077e2a
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
designer/designermenu.pp
View File

@ -126,6 +126,7 @@ type
procedure Link(MenuItem: TMenuItem; ParentM: PDesignerMenuItem);
// Draw function and supplementary functions for setting coordinates
procedure RealignDesigner;
procedure Draw(MenuItem: PDesignerMenuItem; FormPanel,SubMenuPanel: TPanel); //draw function
procedure SetCoordinates(Coord_Left,Coord_Top,Coord_Right: Integer;MenuItem: PDesignerMenuItem); //coord. of each designermenuitem
function GetSubMenuHeight(MenuItem: PDesignerMenuItem; LeftPos,TopPos: Integer; Ident: string): TRect; //width and height of submenu panel
@ -449,6 +450,16 @@ begin
dec(temp_level);
end;
procedure TDesignerMainMenu.RealignDesigner;
var
temp_coord: TRect;
begin
temp_coord:=GetMaxCoordinates(Root, 0, 0);
Panel.Width:=temp_coord.Right + 10;
Panel.Height:=temp_coord.Bottom + 10;
Draw(Root, Panel, Panel);
end;
//------------------------------------------------------------------------------------------//
// Draw the the whole DesignerMenu with active MenuItems and SubMenus ----------------------//
//------------------------------------------------------------------------------------------//
@ -767,9 +778,9 @@ begin
SelectedDesignerMenuItem := DesignerItem^.ID;
ChangeMenuItem(Root, 1, SelectedDesignerMenuItem);
CreateIndexSequence(Root, SelectedDesignerMenuItem, 1);
Parent.Invalidate;
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 9);
RealignDesigner;
end;
end;
@ -791,11 +802,12 @@ begin
NewItem^.Active := True; // set visible
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
InitIndexSequence;
CreateIndexSequence(Root, SelectedDesignerMenuItem, 1);
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem)^.PrevItem, 1, 2);
RealignDesigner;
end;
// ------------------------------------------------------------//
@ -811,11 +823,12 @@ begin
NewItem^.Active := True; // set visible
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
InitIndexSequence;
CreateIndexSequence(Root, SelectedDesignerMenuItem, 1);
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem)^.NextItem, 1, 1);
RealignDesigner;
end;
// ------------------------------------------------------------//
@ -831,11 +844,12 @@ begin
NewItem^.Active := True; // set visible
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
InitIndexSequence;
CreateIndexSequence(Root, SelectedDesignerMenuItem,1);
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem)^.SubMenu, 1, 3);
RealignDesigner;
end;
// -----------------------------------------------------------------------//
@ -861,12 +875,13 @@ begin
if (MoveUp(Root, SelectedDesignerMenuItem) > 0) then
begin
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
InitIndexSequence;
CreateIndexSequence(Root, SelectedDesignerMenuItem, 1);
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 4);
RealignDesigner;
end;
end;
@ -898,12 +913,14 @@ begin
ChangeMenuItem(Root, 2, Root^.ID);
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
if (temp_returnvalue = 1) then
UpdateMenu(fMenu.Items, nil, 1, 7);
if (temp_returnvalue = 2) then
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1 , 8);
ChangeMenuItem(Root, 1, SelectedDesignerMenuItem);
RealignDesigner;
end;
end;
@ -920,7 +937,7 @@ begin
begin
DeleteItem(Item);
SetCoordinates(POSITION_LEFT, POSITION_TOP, 0, Root);
Parent.Invalidate;
RealignDesigner;
end;
end;
inherited;
@ -1198,7 +1215,7 @@ begin
end else
begin
end;
Parent.Invalidate;
RealignDesigner;
end;
// -----------------------------------------------------------------//
@ -1395,7 +1412,7 @@ begin
end;
end;
if InvalidateNeeded then
Parent.Invalidate;
RealignDesigner;
finally
Selection.Free;
end;
@ -1414,12 +1431,13 @@ begin
if (MoveDown(Root, SelectedDesignerMenuItem) > 0) then
begin
SetCoordinates(POSITION_LEFT,POSITION_TOP,0,Root);
Parent.Invalidate;
InitIndexSequence;
CreateIndexSequence(Root, SelectedDesignerMenuItem,1);
UpdateMenu(fMenu.Items, GetDesignerMenuItem(Root, SelectedDesignerMenuItem), 1, 5);
RealignDesigner;
end;
end;

11
designer/menueditorform.pas
View File

@ -134,14 +134,7 @@ begin
end;
procedure TMainMenuEditorForm.FormPaint(Sender: TObject);
var
temp_coord: TRect;
begin
temp_coord:=DesignerMainMenu.GetMaxCoordinates(DesignerMainMenu.Root, 0, 0);
Panel.Width:=temp_coord.Right + 10;
Panel.Height:=temp_coord.Bottom + 10;
//writeln('Panel Width: ', Panel.width, ' Panel Height: ', Panel.Height);
DesignerMainMenu.Draw(DesignerMainMenu.Root, Panel, Panel);
end;
procedure TMainMenuEditorForm.List_menusClick(Sender: TObject);
@ -199,8 +192,7 @@ begin
LoadMainMenu;
SetCoordinates(10,10,0,DesignerMainMenu.Root);
end;
Invalidate;
DesignerMainMenu.Panel := Panel;
end;
procedure TMainMenuEditorForm.UpdateListOfMenus;
@ -242,6 +234,7 @@ begin
fDesigner := FindRootDesigner(fMenu) as TComponentEditorDesigner;
UpdateListOfMenus;
CreateDesignerMenu;
DesignerMainMenu.Draw(DesignerMainMenu.Root, Panel, Panel);
end;
end;