monolith

public

Star0

Fork 0

Watch0

315 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `29e5c25cd383`

tarball

atagen <boss@atagen.co>2026-10-19 10:59 UTC

3 files changed+10-1

input: keep the resize cursor off while a drag and drop runs

The hover edges were recomputed on every motion, so a drag and drop passing over a floating window's ring replaced the drag cursor with a resize arrow.

Modified file: crates/monolith/src/input.rs+4 additions−1 deletions@@ -75,7 +75,10 @@ impl State {
             None => (None, None),
         };
         let before = pointer.current_focus().and_then(|s| s.client());
-        let hover = self.edge_at(pos, cover).map(|(_, e)| e);
+        let hover = self
+            .edge_at(pos, cover)
+            .filter(|_| !self.input.dnd)
+            .map(|(_, e)| e);
         if std::mem::replace(&mut self.input.hover, hover) != hover {
             self.dirty.cursor = true;
         }

Modified file: crates/monolith/src/seat.rs+4 additions@@ -135,6 +135,7 @@ impl State {
     }
 
     fn end_dnd(&mut self) {
+        self.input.dnd = false;
         self.input.dnd_icon = None;
         self.dirty.redraw = true;
     }
@@ -174,6 +175,9 @@ impl WaylandDndGrabHandler for State {
                     return self.end_dnd();
                 };
                 let grab = DnDGrab::new_pointer(&dh, start_data, source, seat.clone());
+                self.input.dnd = true;
+                self.input.hover = None;
+                self.dirty.cursor = true;
                 if let Some(pointer) = seat.get_pointer() {
                     pointer.set_grab(self, grab, serial, Focus::Keep);
                 }

Modified file: crates/monolith/src/state.rs+2 additions@@ -63,6 +63,7 @@ pub struct Input {
     pub cursor: crate::cursor::Cursor,
     pub cursor_status: CursorImageStatus,
     pub dnd_icon: Option<crate::cursor::DndIcon>,
+    pub dnd: bool,
     /// The edges of the window border under the pointer, for the resize cursor.
     pub hover: Option<crate::input::Edges>,
     /// The output the pointer was last on, whose scale cursor and drag icon surfaces follow.
@@ -209,6 +210,7 @@ impl State {
                 cursor: crate::cursor::Cursor::load(),
                 cursor_status: CursorImageStatus::default_named(),
                 dnd_icon: None,
+                dnd: false,
                 hover: None,
                 pointer_output: None,
                 absolute: None,

monolith

Commit 29e5c25cd383

Commit `29e5c25cd383`