From 2ac2eea1d598d763edc19d2886eb485ebd938c60 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 15 Mar 2016 11:22:26 +0000
Subject: [PATCH] IDE: Minor optimization, keep value from Designer.CanCopy in
 boolean variables.

git-svn-id: trunk@51949 -
---
 designer/designer.pp |  7 ++++---
 ide/main.pp          | 13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/designer/designer.pp b/designer/designer.pp
index 20429b7056..9f9a64590e 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -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;
 
diff --git a/ide/main.pp b/ide/main.pp
index 70480908a9..0decfcc5ac 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -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