Fix more visual glitches while dragging tabs

Adanos020 · Apr 3, 2024 · d7176d6 · d7176d6
1 parent 9cf801d
commit d7176d6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/src/widgets/dock_area/show/leaf.rs b/src/widgets/dock_area/show/leaf.rs
@@ -267,12 +267,15 @@ impl<'tree, Tab> DockArea<'tree, Tab> {
                             .transform_layer_shapes(layer_id, TSTransform::new(delta, 1.0));
 
                         tabs_ui.memory_mut(|mem| {
-                            let drag_data_mut =
-                                mem.data.get_temp_mut_or(self.id.with("drag_data"), None);
-                            *drag_data_mut = Some(DragData {
-                                src: TreeComponent::Tab(surface_index, node_index, tab_index),
-                                rect: self.dock_state[surface_index][node_index].rect().unwrap(),
-                            });
+                            mem.data.insert_temp(
+                                self.id.with("drag_data"),
+                                Some(DragData {
+                                    src: TreeComponent::Tab(surface_index, node_index, tab_index),
+                                    rect: self.dock_state[surface_index][node_index]
+                                        .rect()
+                                        .unwrap(),
+                                }),
+                            );
                         });
                     }
                 }
@@ -848,8 +851,10 @@ impl<'tree, Tab> DockArea<'tree, Tab> {
                 };
 
                 ui.memory_mut(|mem| {
-                    let hover_data_mut = mem.data.get_temp_mut_or(self.id.with("hover_data"), None);
-                    *hover_data_mut = Some(HoverData { rect, dst, tab });
+                    mem.data.insert_temp(
+                        self.id.with("hover_data"),
+                        Some(HoverData { rect, dst, tab }),
+                    );
                 });
             }
         }

diff --git a/src/widgets/dock_area/show/main_surface.rs b/src/widgets/dock_area/show/main_surface.rs
@@ -22,12 +22,14 @@ impl<'tree, Tab> DockArea<'tree, Tab> {
             let response = ui.allocate_rect(rect, Sense::hover());
             if response.contains_pointer() {
                 ui.memory_mut(|mem| {
-                    let hover_data_mut = mem.data.get_temp_mut_or(self.id.with("hover_data"), None);
-                    *hover_data_mut = Some(HoverData {
-                        rect,
-                        dst: TreeComponent::Surface(surf_index),
-                        tab: None,
-                    });
+                    mem.data.insert_temp(
+                        self.id.with("hover_data"),
+                        Some(HoverData {
+                            rect,
+                            dst: TreeComponent::Surface(surf_index),
+                            tab: None,
+                        }),
+                    );
                 });
             }
             return;

diff --git a/src/widgets/dock_area/show/mod.rs b/src/widgets/dock_area/show/mod.rs
@@ -105,10 +105,13 @@ impl<'tree, Tab> DockArea<'tree, Tab> {
                     };
                     self.dock_state.move_tab(source, destination);
                 }
-                state.reset_drag();
             }
         }
 
+        if ui.input(|i| i.pointer.primary_released()) {
+            state.reset_drag();
+        }
+
         let style = self.style.as_ref().unwrap();
         let fade_surface =
             self.hovered_window_surface(&mut state, style.overlay.feel.fade_hold_time, ui.ctx());