Ordering on screens by true x position (sminez#198)

* Ordering on screens by true x position Will give correct screen ordering * `sort_by_key` and no PartialOrd
rinkimekari · Nov 27, 2021 · 6edc98a · 6edc98a
1 parent e0c9ba7
commit 6edc98a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/manager/screens.rs b/src/core/manager/screens.rs
@@ -93,8 +93,12 @@ impl Screens {
 
         debug!(?workspace_ordering, "current workspace ordering");
 
-        let detected: Vec<Screen> = state
-            .current_screens()?
+        let mut detected: Vec<Screen> = state.current_screens()?;
+
+        // sort the screens to be in the correct order
+        detected.sort_by_key(|s| s.true_region.x);
+
+        let detected = detected
             .into_iter()
             .zip(workspace_ordering)
             .enumerate()

diff --git a/src/core/screen.rs b/src/core/screen.rs
@@ -7,7 +7,7 @@ use crate::core::data_types::{Point, Region};
 pub struct Screen {
     /// The current workspace index being displayed
     pub wix: usize,
-    true_region: Region,
+    pub(crate) true_region: Region,
     effective_region: Region,
 }