From 8e7c84ff70696cb89a8e585cd1b6dcab4b26053d Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Sat, 17 Aug 2002 23:40:30 +0000
Subject: [PATCH] MG: fixed designer popupmenu

git-svn-id: trunk@1983 -
---
 designer/designer.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer/designer.pp b/designer/designer.pp
index 67ec051570..c0edee90d9 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -1106,14 +1106,15 @@ end;
 
 procedure TDesigner.BuildPopupMenu;
 var
-  ControlSelIsNotEmpty, FormIsSelected, OnlyNonVisualCompsAreSelected,
+  ControlSelIsNotEmpty,
+  FormIsSelected,
+  OnlyNonVisualCompsAreSelected,
   CompsAreSelected: boolean;
 begin
   if FPopupMenu<>nil then FPopupMenu.Free;
 
   ControlSelIsNotEmpty:=ControlSelection.Count>0;
-  FormIsSelected:=ControlSelIsNotEmpty 
-    and (ControlSelection[0].Component is TCustomForm);
+  FormIsSelected:=ControlSelection.IsSelected(Form);
   OnlyNonVisualCompsAreSelected:=
     ControlSelection.OnlyNonVisualComponentsSelected;
   CompsAreSelected:=ControlSelIsNotEmpty and not FormIsSelected;
@@ -1148,7 +1149,7 @@ begin
   with FScaleMenuItem do begin
     Caption := 'Scale';
     OnClick := @OnScalePopupMenuClick;
-    Enabled := CompsAreSelected and OnlyNonVisualCompsAreSelected;
+    Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected;
   end;
   FPopupMenu.Items.Add(FScaleMenuItem);
 
@@ -1156,7 +1157,7 @@ begin
   with FSizeMenuItem do begin
     Caption := 'Size';
     OnClick := @OnSizePopupMenuClick;
-    Enabled := CompsAreSelected and OnlyNonVisualCompsAreSelected;
+    Enabled := CompsAreSelected and not OnlyNonVisualCompsAreSelected;
   end;
   FPopupMenu.Items.Add(FSizeMenuItem);