andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Hardcode winit transform for now

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-01-29 10:17:26 +04:00
parent 7052f0129e
commit 2e50f8dee0
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/winit.rs
+1 -2
View File
@@ -16,7 +16,6 @@ use smithay::reexports::calloop::LoopHandle;
use smithay::reexports::wayland_protocols::wp::presentation_time::server::wp_presentation_feedback; use smithay::reexports::wayland_protocols::wp::presentation_time::server::wp_presentation_feedback;
use smithay::reexports::winit::dpi::LogicalSize; use smithay::reexports::winit::dpi::LogicalSize;
use smithay::reexports::winit::window::WindowBuilder; use smithay::reexports::winit::window::WindowBuilder;
use smithay::utils::Transform;
use super::RenderResult; use super::RenderResult;
use crate::niri::{RedrawState, State}; use crate::niri::{RedrawState, State};
@@ -54,7 +53,7 @@ impl Winit {
size: backend.window_size(), size: backend.window_size(),
refresh: 60_000, refresh: 60_000,
}; };
output.change_current_state(Some(mode), Some(Transform::Flipped180), None, None); output.change_current_state(Some(mode), None, None, None);
output.set_preferred(mode); output.set_preferred(mode);
let physical_properties = output.physical_properties(); let physical_properties = output.physical_properties();
src/niri.rs
+10 -2
View File
@@ -654,9 +654,13 @@ impl State {
let scale = config.map(|c| c.scale).unwrap_or(1.); let scale = config.map(|c| c.scale).unwrap_or(1.);
let scale = scale.clamp(1., 10.).ceil() as i32; let scale = scale.clamp(1., 10.).ceil() as i32;
let transform = config let mut transform = config
.map(|c| c.transform.into()) .map(|c| c.transform.into())
.unwrap_or(Transform::Normal); .unwrap_or(Transform::Normal);
// FIXME: fix winit damage on other transforms.
if name == "winit" {
transform = Transform::Flipped180;
}
if output.current_scale().integer_scale() != scale if output.current_scale().integer_scale() != scale
|| output.current_transform() != transform || output.current_transform() != transform
@@ -1179,7 +1183,11 @@ impl Niri {
let c = config.outputs.iter().find(|o| o.name == name); let c = config.outputs.iter().find(|o| o.name == name);
let scale = c.map(|c| c.scale).unwrap_or(1.); let scale = c.map(|c| c.scale).unwrap_or(1.);
let scale = scale.clamp(1., 10.).ceil() as i32; let scale = scale.clamp(1., 10.).ceil() as i32;
let transform = c.map(|c| c.transform.into()).unwrap_or(Transform::Normal); let mut transform = c.map(|c| c.transform.into()).unwrap_or(Transform::Normal);
// FIXME: fix winit damage on other transforms.
if name == "winit" {
transform = Transform::Flipped180;
}
drop(config); drop(config);
// Set scale and transform before adding to the layout since that will read the output size. // Set scale and transform before adding to the layout since that will read the output size.