bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use fractional scaling when setting scale through xsettings

Browse source 
Fixes #168
This commit is contained in:
Shawn Wallace 2025-06-19 17:02:42 -04:00
parent 799027d1ae
commit b98fa84524
6 changed files with 269 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xstate/settings.rs
View file

@ -27,7 +27,7 @@ impl XState {
}
}
pub(crate) fn update_global_scale(&mut self, scale: i32) {
pub(crate) fn update_global_scale(&mut self, scale: f64) {
self.settings.set_scale(scale);
self.connection
.send_and_check_request(&x::ChangeProperty {
@ -57,6 +57,7 @@ pub(super) struct Settings {
settings: HashMap<&'static str, IntSetting>,
}
#[derive(Copy, Clone)]
struct IntSetting {
value: i32,
last_change_serial: u32,
@ -160,17 +161,26 @@ impl Settings {
data
}
fn set_scale(&mut self, scale: i32) {
fn set_scale(&mut self, scale: f64) {
self.serial += 1;
self.settings.entry(XFT_DPI).insert_entry(IntSetting {
value: scale * DEFAULT_DPI * DPI_SCALE_FACTOR,
let setting = IntSetting {
value: (scale * DEFAULT_DPI as f64 * DPI_SCALE_FACTOR as f64).round() as i32,
last_change_serial: self.serial,
});
};
self.settings.entry(XFT_DPI).insert_entry(setting);
// Gdk/WindowScalingFactor + Gdk/UnscaledDPI is identical to setting
// GDK_SCALE = scale and then GDK_DPI_SCALE = 1 / scale.
self.settings
.entry(GDK_UNSCALED_DPI)
.insert_entry(IntSetting {
value: setting.value / scale as i32,
last_change_serial: self.serial,
});
self.settings
.entry(GDK_WINDOW_SCALE)
.insert_entry(IntSetting {
value: scale,
value: scale as i32,
last_change_serial: self.serial,
});
}