From 73436f5677439aeb733ce84fdcd511538522b85e Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Fri, 18 Jul 2025 16:16:27 +0200
Subject: [PATCH] container: fix member order

---
 src/tree/container.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/tree/container.rs b/src/tree/container.rs
index b867d928..3e570aed 100644
--- a/src/tree/container.rs
+++ b/src/tree/container.rs
@@ -1543,6 +1543,10 @@ impl Node for ContainerNode {
         .unwrap()
     }
 
+    fn node_output(&self) -> Option<Rc<OutputNode>> {
+        self.toplevel_data.output_opt()
+    }
+
     fn node_child_title_changed(self: Rc<Self>, child: &dyn Node, title: &str) {
         if let Some(child) = self.child_nodes.borrow().get(&child.node_id()) {
             self.update_child_title(child, title);
@@ -1675,6 +1679,14 @@ impl Node for ContainerNode {
             .node_do_focus(seat, Direction::Unspecified);
     }
 
+    fn node_on_leave(&self, seat: &WlSeatGlobal) {
+        let mut seats = self.cursors.borrow_mut();
+        let id = CursorType::Seat(seat.id());
+        if let Some(seat_state) = seats.get_mut(&id) {
+            seat_state.op = None;
+        }
+    }
+
     fn node_on_pointer_enter(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, x: Fixed, y: Fixed) {
         // log::info!("node_on_pointer_enter");
         self.pointer_move(
@@ -1687,14 +1699,6 @@ impl Node for ContainerNode {
         );
     }
 
-    fn node_on_leave(&self, seat: &WlSeatGlobal) {
-        let mut seats = self.cursors.borrow_mut();
-        let id = CursorType::Seat(seat.id());
-        if let Some(seat_state) = seats.get_mut(&id) {
-            seat_state.op = None;
-        }
-    }
-
     fn node_on_pointer_unfocus(&self, seat: &Rc<WlSeatGlobal>) {
         // log::info!("unfocus");
         let mut seats = self.cursors.borrow_mut();
@@ -1781,10 +1785,6 @@ impl Node for ContainerNode {
     fn node_is_container(&self) -> bool {
         true
     }
-
-    fn node_output(&self) -> Option<Rc<OutputNode>> {
-        self.toplevel_data.output_opt()
-    }
 }
 
 impl ContainingNode for ContainerNode {