Fix drag issue

Author: SioGabx

SioForgeCAD/Forms/LayoutBar.xaml

@@ -207,8 +207,8 @@
                 Height="28"
                 Cursor="Hand"
                 MouseLeftButtonDown="Item_MouseLeftButtonDown"
-                ToolTipOpening="Item_ToolTipOpening"
-                MouseLeftButtonUp="Item_MouseLeftButtonUp">
+                MouseLeftButtonUp="Item_MouseLeftButtonUp"
+                ToolTipOpening="Item_ToolTipOpening">
 
                 <Grid.ContextMenu>
                     <ContextMenu Opened="TabContextMenu_Opened">
@@ -277,9 +277,16 @@
 
                 <Grid.ToolTip>
                     <ToolTip Placement="Top" VerticalOffset="-2">
-                        <Border Padding="6" Background="{StaticResource TabBarBackground}" 
-                    BorderBrush="{StaticResource TabBackground}" BorderThickness="1">
-                            <Image x:Name="TooltipImage" Stretch="Uniform" MaxWidth="300" MaxHeight="200"/>
+                        <Border
+                            Padding="6"
+                            Background="{StaticResource TabBarBackground}"
+                            BorderBrush="{StaticResource TabBackground}"
+                            BorderThickness="1">
+                            <Image
+                                x:Name="TooltipImage"
+                                MaxWidth="300"
+                                MaxHeight="200"
+                                Stretch="Uniform" />
                         </Border>
                     </ToolTip>
                 </Grid.ToolTip>

SioForgeCAD/Forms/LayoutBar.xaml.cs

@@ -45,7 +45,7 @@ public partial class LayoutBar : UserControl
         private LayoutItem _lastSelectedItem;
 
         // Variables Drag & Drop
-        private Point _dragStart;
+        private Point? _dragStart;
         private bool _isDragging;
         private LayoutItem _dragSource;
 
@@ -277,6 +277,18 @@ private void ReloadTabs(Document doc)
             });
         }
 
+        private static void ExpandLayoutItemGroup(LayoutItem item, bool IsExpanded)
+        {
+            if (item is LayoutTab tab && tab.IsInGroup && tab.ParentGroup is LayoutGroup gp)
+            {
+                gp.IsExpanded = IsExpanded;
+            }
+            else if (item is LayoutGroup gp2)
+            {
+                gp2.IsExpanded = IsExpanded;
+            }
+        }
+
         private bool TryCreateNewLayout(string title)
         {
             if (IsSyncing) return false;
@@ -303,7 +315,8 @@ private void Item_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if ((sender as FrameworkElement)?.DataContext is LayoutItem clickedItem)
             {
-                _dragStart = e.GetPosition(null);
+                _dragStart = e.GetPosition(this);
+                Debug.WriteLine("_dragStart to " + _dragStart.ToString());
                 _dragSource = GetTabFromRegularList(clickedItem);
                 _isDragging = false;
             }
@@ -437,14 +450,15 @@ private List<LayoutItem> GetVisibleItemsList(bool IncludePinnedItems = true)
 
         #region Drag & Drop
 
-        protected override void OnPreviewMouseMove(MouseEventArgs e)
+        protected override void OnMouseMove(MouseEventArgs e)
         {
-            base.OnPreviewMouseMove(e);
+            base.OnMouseMove(e);
 
-            if (e.LeftButton == MouseButtonState.Pressed && !_isDragging && _dragSource != null)
+            if (e.LeftButton == MouseButtonState.Pressed && !_isDragging && _dragSource != null && _dragStart is Point dragStart)
             {
-                Vector diff = _dragStart - e.GetPosition(null);
-
+                Point currentPos = e.GetPosition(this);
+                Vector diff = dragStart - currentPos;
+                Debug.WriteLine("check _dragStart + current pos " + currentPos);
                 if (Math.Abs(diff.X) > DRAG_THRESHOLD || Math.Abs(diff.Y) > DRAG_THRESHOLD)
                 {
                     _isDragging = true;
@@ -461,13 +475,9 @@ protected override void OnPreviewMouseMove(MouseEventArgs e)
                         .ToList();
 
                     //Close all groups for preview
-                    foreach (var item in selectedItems)
-                    {
-                        if (item is LayoutTab tab && tab.IsInGroup && tab.ParentGroup is LayoutGroup gp)
-                        {
-                            gp.IsExpanded = false;
-                        }
-                    }
+                    selectedItems.ForEach(t => ExpandLayoutItemGroup(t, false));
+
+                    Debug.WriteLine("CreatePreviewWindow");
                     CreatePreviewWindow(selectedItems);
                     _autoScrollTimer.Start();
 
@@ -870,6 +880,8 @@ private void TabContextMenu_Opened(object sender, RoutedEventArgs e)
         {
             if (sender is ContextMenu menu && menu.PlacementTarget is FrameworkElement fe && fe.DataContext is LayoutTab tab)
             {
+                _dragStart = null; //avoid drag
+                Debug.WriteLine("_dragStart to null");
                 var targetTabs = GetTargetedTabsForContextMenu(sender);
 
                 foreach (MenuItem menuItem in menu.Items.OfType<MenuItem>())

SioForgeCAD/Properties/AssemblyInfo.cs

@@ -25,6 +25,6 @@
 //Hot Reload and Edit & Continue are not compatible with using * in AssemblyVersionAttribute value.
 //Presence of * in the version means that the compiler generates a new version every build based on the current time.
 //The build then produces non-reproducible, non-deterministic outputs
-[assembly: AssemblyVersion("2026.4.15.10")]
-[assembly: AssemblyFileVersion("2026.4.15.10")]
+[assembly: AssemblyVersion("2026.4.15.16")]
+[assembly: AssemblyFileVersion("2026.4.15.16")]
 [assembly: NeutralResourcesLanguage("")]