Преглед на файлове

Fixed Fill showing up when fill block made.

Kenric Nugteren преди 1 месец
родител
ревизия
4fe4f2a5f0
променени са 1 файла, в които са добавени 13 реда и са изтрити 6 реда
  1. 13 6
      prs.desktop/Components/Calendar/Calendar.xaml.cs

+ 13 - 6
prs.desktop/Components/Calendar/Calendar.xaml.cs

@@ -1093,7 +1093,7 @@ namespace PRSDesktop
 
         private void Calendar_BlockHeld(object sender, CalendarBlockEventArgs e)
         {
-            Calendar_BlockRightClicked(sender, e);
+            OpenContextMenu(sender, e, false);
         }
 
         public enum ContextMenuItems
@@ -1121,8 +1121,12 @@ namespace PRSDesktop
                 return slot;
             }
         }
-
         private void Calendar_BlockRightClicked(object sender, CalendarBlockEventArgs e)
+        {
+            OpenContextMenu(sender, e, true);
+        }
+
+        private void OpenContextMenu(object sender, CalendarBlockEventArgs e, bool allowFill)
         {
             object? value;
             if(e.Value is AssignmentAppointment appointment)
@@ -1215,10 +1219,13 @@ namespace PRSDesktop
                 createmenu.AddItem("New Assignment", null, slot, slot => CreateAssignment(slot));
                 // createmenu.AddItem("New Meeting", null, slot, CreateMeeting);
 
-                var fillMenu = e.Menu.AddItem("Fill...", null, null)
-                    .WithName($"Menu_{nameof(ContextMenuItems.Fill)}");
-                fillMenu.AddItem("New Assignment", null, () => CreateAssignment(FillSlot(e, slot)));
-                // fillMenu.AddItem("New Meeting", null, () => CreateMeeting(FillSlot(e, slot)));
+                if (allowFill)
+                {
+                    var fillMenu = e.Menu.AddItem("Fill...", null, null)
+                        .WithName($"Menu_{nameof(ContextMenuItems.Fill)}");
+                    fillMenu.AddItem("New Assignment", null, () => CreateAssignment(FillSlot(e, slot)));
+                    // fillMenu.AddItem("New Meeting", null, () => CreateMeeting(FillSlot(e, slot)));
+                }
 
                 if (_copiedmodel != null)
                 {