From 0a2052945e62c31585a3c7ec4c0efa84ebc5d312 Mon Sep 17 00:00:00 2001
From: Kirill Chibisov <contact@kchibisov.com>
Date: Thu, 26 Oct 2023 00:15:46 +0400
Subject: Add support for wl_compositor@v6

---
 src/backend/tty.rs   |  5 ++---
 src/backend/winit.rs | 13 ++++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/backend')

diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index 52ec1ebd..1c3bbe44 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -529,9 +529,6 @@ impl Tty {
             .map(|info| (info.manufacturer, info.model))
             .unwrap_or_else(|| ("Unknown".into(), "Unknown".into()));
 
-        let scale = config.scale.clamp(0.1, 10.);
-        let scale = scale.max(1.).round() as i32;
-
         let output = Output::new(
             output_name.clone(),
             PhysicalProperties {
@@ -541,7 +538,9 @@ impl Tty {
                 make,
             },
         );
+
         let wl_mode = Mode::from(*mode);
+        let scale = config.scale.clamp(1., 10.).ceil() as i32;
         output.change_current_state(Some(wl_mode), None, Some(Scale::Integer(scale)), None);
         output.set_preferred(wl_mode);
 
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index 1afb8d97..9bdf734b 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -45,13 +45,6 @@ impl Winit {
             .find(|o| o.name == "winit")
             .cloned()
             .unwrap_or_default();
-        let scale = output_config.scale.clamp(0.1, 10.);
-        let scale = scale.max(1.).round() as i32;
-
-        let mode = Mode {
-            size: backend.window_size(),
-            refresh: 60_000,
-        };
 
         let output = Output::new(
             "winit".to_string(),
@@ -62,6 +55,12 @@ impl Winit {
                 model: "Winit".into(),
             },
         );
+
+        let mode = Mode {
+            size: backend.window_size(),
+            refresh: 60_000,
+        };
+        let scale = output_config.scale.clamp(1., 10.).ceil() as i32;
         output.change_current_state(
             Some(mode),
             Some(Transform::Flipped180),
-- 
cgit