Merge branch 'compdfkit_demo_win_dev_measure' of http://git.kdan.cc:8865/Others/kmpdfkit_demo into compdfkit_demo_win_dev_measure

Demo/Examples/Compdfkit_Tools/Measure/MeasureControl.xaml.cs

@@ -72,32 +72,28 @@ namespace Compdfkit_Tools.Measure
             switch (e.CommandType)
             {
                 case CommandType.Context:
-                    e.Handle = true;
-                    if (e.CommandTarget == TargetType.Annot)
+                    if (e.CommandTarget == TargetType.Annot && e.PressOnAnnot)
                     {
                         e.Handle = true;
                         e.PopupMenu = new ContextMenu();
-                        if (e.PressOnAnnot)
+                        e.PopupMenu.Items.Add(new MenuItem() { Header = "Delete", Command = ApplicationCommands.Delete, CommandTarget = (UIElement)sender });
+                        MenuItem menuItem = new MenuItem();
+                        menuItem.Header = "Measure Setting";
+                        menuItem.Click += (item, param) =>
                         {
-                            e.PopupMenu.Items.Add(new MenuItem() { Header = "Delete", Command = ApplicationCommands.Delete, CommandTarget = (UIElement)sender });
-                            MenuItem menuItem = new MenuItem();
-                            menuItem.Header = "Measure Setting";
-                            menuItem.Click += (item, param) =>
-                            {
-                                SettingPanel.UpdateArgsList = e.AnnotEventArgsList;
-                                SettingPanel.BindMeasureSetting();
-                                SetInfoPanelVisble(false, true);
-                            };
-
-                            MenuItem propertyItem = new MenuItem();
-                            propertyItem.Header = "Property Setting";
-                            propertyItem.Click += (item, param) =>
-                            {
-                                ExpandEvent?.Invoke(this, new EventArgs());
-                            };
-                            e.PopupMenu.Items.Add(menuItem);
-                            e.PopupMenu.Items.Add(propertyItem);
-                        }
+                            SettingPanel.UpdateArgsList = e.AnnotEventArgsList;
+                            SettingPanel.BindMeasureSetting();
+                            SetInfoPanelVisble(false, true);
+                        };
+
+                        MenuItem propertyItem = new MenuItem();
+                        propertyItem.Header = "Property Setting";
+                        propertyItem.Click += (item, param) =>
+                        {
+                            ExpandEvent?.Invoke(this, new EventArgs());
+                        };
+                        e.PopupMenu.Items.Add(menuItem);
+                        e.PopupMenu.Items.Add(propertyItem);
                     }
                     break;