leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwayland: Honor primary output for fractional scale

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-04-10 19:42:48 +02:00 • committed by Victoria Brekenfeld
parent 2a3bd84e22
commit 155f8d20d0
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xwayland.rs
View file

@ -569,10 +569,16 @@ impl Common {
} }
XwaylandDescaling::Fractional => { XwaylandDescaling::Fractional => {
let shell = self.shell.read().unwrap(); let shell = self.shell.read().unwrap();
shell let val =
.outputs() if let Some(output) = shell.outputs().find(|o| o.config().xwayland_primary) {
.map(|o| o.current_scale().fractional_scale()) output.current_scale().fractional_scale().max(1f64)
.fold(1f64, |acc, val| acc.max(val)) } else {
shell
.outputs()
.map(|o| o.current_scale().fractional_scale())
.fold(1f64, |acc, val| acc.max(val))
};
val
} }
}; };
@ -1143,6 +1149,7 @@ impl XwmHandler for State {
output_name.as_deref().is_some_and(|o| o == output.name()); output_name.as_deref().is_some_and(|o| o == output.name());
} }
self.common.output_configuration_state.update(); self.common.output_configuration_state.update();
self.common.update_xwayland_scale();
self.common self.common
.config .config
.write_outputs(self.common.output_configuration_state.outputs()); .write_outputs(self.common.output_configuration_state.outputs());