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

fix(display): Show revert dialog iff mode changed

Browse source 
Closes: #1190

RandR may revert or not apply invalid mode changes. The revert dialog
shouldn't show in these cases.
This commit is contained in:
Josh Megnauth 2025-05-16 00:28:07 -04:00 • committed by Michael Murphy
parent bd2db99f3e
commit b229c80717
1 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cosmic-settings/src/pages/display/mod.rs
View file

@ -74,7 +74,7 @@ pub enum Message {
DialogCancel,
/// The dialog was completed.
DialogComplete,
/// How long until the dialog automatically cancelles, in seconds.
/// How long until the dialog automatically cancels, in seconds.
DialogCountdown,
/// Toggles display on or off.
DisplayToggle(bool),
@ -475,6 +475,34 @@ impl Page {
Message::RandrResult(result) => {
if let Some(Err(why)) = Arc::into_inner(result) {
tracing::error!(why = why.to_string(), "cosmic-randr error");
// Cancel the revert dialog if resolution or refresh rate did not change.
// RandR may revert those changes in certain circumstances so showing the
// dialog is superfluous and confusing.
if let Some(mode) =
self.list
.outputs
.get(self.active_display)
.and_then(|display| {
display.current.and_then(|key| self.list.modes.get(key))
})
{
tracing::debug!(old = ?self.dialog, new = ?mode, "Mode update");
match self.dialog {
Some(Randr::Resolution(width, height)) => {
if mode.size.0 == width && mode.size.1 == height {
self.config.resolution = Some((width, height));
return self.update(Message::DialogComplete);
}
}
Some(Randr::RefreshRate(rate)) => {
if mode.refresh_rate == rate {
self.config.refresh_rate = Some(rate);
return self.update(Message::DialogComplete);
}
}
_ => {}
}
}
}
}