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

IDE: Minor optimization, keep value from Designer.CanCopy in boolean variables.

Browse Source 
git-svn-id: trunk@51949 -
This commit is contained in:
juha 2016-03-15 11:22:26 +00:00
parent c44a316e99
commit 2ac2eea1d5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
designer/designer.pp
View File

@ -3905,7 +3905,7 @@ var
OneControlSelected: Boolean;
SelectionVisible: Boolean;
SrcFile: TLazProjectFile;
UnitIsVirtual: Boolean;
UnitIsVirtual, DesignerCanCopy: Boolean;
function GetChangeParentCandidates: TFPList;
var
@ -4014,8 +4014,9 @@ begin
DesignerMenuOrderForwardOne.Enabled := OneControlSelected and not OnlyNonVisualsAreSelected;
DesignerMenuOrderBackOne.Enabled := OneControlSelected and not OnlyNonVisualsAreSelected;
DesignerMenuCut.Enabled := CanCopy;
DesignerMenuCopy.Enabled := CanCopy;
DesignerCanCopy := CanCopy;
DesignerMenuCut.Enabled := DesignerCanCopy;
DesignerMenuCopy.Enabled := DesignerCanCopy;
DesignerMenuPaste.Enabled := CanPaste;
DesignerMenuDeleteSelection.Enabled := CompsAreSelected;

13
ide/main.pp
View File

@ -3633,10 +3633,10 @@ procedure TMainIDE.UpdateEditorCommands(Sender: TObject);
var
ASrcEdit: TSourceEditor;
AnUnitInfo: TUnitInfo;
Editable: Boolean;
SelAvail: Boolean;
SelEditable: Boolean;
SrcEditorActive, DsgEditorActive, IdentFound, StringFound: Boolean;
Editable, SelEditable: Boolean;
SelAvail, DesignerCanCopy: Boolean;
SrcEditorActive, DsgEditorActive: Boolean;
IdentFound, StringFound: Boolean;
ActiveDesigner: TComponentEditorDesigner;
CurWordAtCursor: string;
begin
@ -3667,8 +3667,9 @@ begin
begin
IDECommandList.FindIDECommand(ecUndo).Enabled := DsgEditorActive and ActiveDesigner.CanUndo; {and not ActiveDesigner.ReadOnly}
IDECommandList.FindIDECommand(ecRedo).Enabled := DsgEditorActive and ActiveDesigner.CanRedo; {and not ActiveDesigner.ReadOnly}
IDECommandList.FindIDECommand(ecCut).Enabled := ActiveDesigner.CanCopy;
IDECommandList.FindIDECommand(ecCopy).Enabled := ActiveDesigner.CanCopy;
DesignerCanCopy := ActiveDesigner.CanCopy;
IDECommandList.FindIDECommand(ecCut).Enabled := DesignerCanCopy;
IDECommandList.FindIDECommand(ecCopy).Enabled := DesignerCanCopy;
IDECommandList.FindIDECommand(ecPaste).Enabled := ActiveDesigner.CanPaste;
IDECommandList.FindIDECommand(ecSelectAll).Enabled := Assigned(ActiveDesigner.Form) and (ActiveDesigner.Form.ComponentCount>0);
end