Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 63 additions & 9 deletions src/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,7 @@ fn load_group_config(ui: &QuickAccess) -> LoadedGroups {
let snapshot = match ConfigProfileStore::default_store().and_then(|store| store.load_active()) {
Ok(snapshot) => snapshot,
Err(error) => {
diagnostics::log(Level::Error, "config", "load", None, error.to_string());
set_geometry_unconfigured(ui);
ui.set_geometry_save_blocked(true);
ui.set_geometry_error(error.to_string().into());
Expand Down Expand Up @@ -1512,11 +1513,9 @@ fn apply_config_reload(
Ok(snapshot) => snapshot,
Err(error) => {
diagnostics::log(Level::Error, "config", "reload", None, error.to_string());
surface_transient_error(
ui,
error_revision,
&format!("Couldn’t reload configuration: {error}"),
);
ui.set_geometry_save_blocked(true);
ui.set_geometry_valid(false);
ui.set_geometry_error(error.to_string().into());
return false;
}
};
Expand Down Expand Up @@ -1582,10 +1581,6 @@ fn persist_groups(
profile_revision: &Arc<Mutex<ProfileRevision>>,
) -> bool {
if ui.get_geometry_save_blocked() {
surface_persistence_error(
ui,
"The saved configuration is invalid; reset or repair it before saving",
);
return false;
}
let validated = match validate_group_drafts(groups) {
Expand All @@ -1604,6 +1599,9 @@ fn persist_validated_groups(
active: usize,
profile_revision: &Arc<Mutex<ProfileRevision>>,
) -> bool {
if ui.get_geometry_save_blocked() {
return false;
}
let persisted = groups.iter().map(ValidatedGroupDraft::to_config).collect();
let Some(selected_group_id) = groups.get(active).map(ValidatedGroupDraft::id) else {
surface_persistence_error(ui, "The selected mapping group no longer exists");
Expand Down Expand Up @@ -2462,6 +2460,62 @@ mod tests {
restored.groups[0].sizing.unwrap().strategy,
SizingStrategy::RoundedScale
);

// A failed read must survive UI edits and hydration until a good reload.
// This child process uses a temporary LOCALAPPDATA, never the real profile.
let saved = std::fs::read(store.path()).unwrap();
std::fs::write(store.path(), b"{").unwrap();
let read_error = store.load_active().unwrap_err().to_string();
let fallback = super::load_group_config(&ui);
assert_eq!(fallback.groups.len(), 1);
assert!(ui.get_geometry_save_blocked());
assert!(!ui.get_geometry_valid());
ui.invoke_geometry_edited();
ui.invoke_save_geometry();
ui.invoke_rendering_edited();
super::hydrate_group(
&ui,
&tray,
&displays.lock().unwrap(),
&groups.lock().unwrap(),
*active.lock().unwrap(),
);
assert_eq!(ui.get_geometry_error(), read_error.as_str());
assert!(!ui.get_geometry_valid());
// Invalid drafts must not replace the original read error with validation.
assert!(!super::persist_groups(&ui, &[], 0, &profile));
assert!(!super::persist_validated_groups(&ui, &[], 0, &profile));
assert_eq!(ui.get_geometry_error(), read_error.as_str());
assert_eq!(std::fs::read(store.path()).unwrap(), b"{");
let reload = || {
super::apply_config_reload(
&ui,
&tray,
&displays,
&groups,
&active,
&profile,
&error_revision,
)
};
ui.set_geometry_save_blocked(false);
ui.set_geometry_valid(true);
assert!(!reload());
assert!(ui.get_geometry_save_blocked());
assert!(!ui.get_geometry_valid());
assert_eq!(ui.get_geometry_error(), read_error.as_str());
std::fs::write(store.path(), saved).unwrap();
assert!(reload());
assert!(!ui.get_geometry_save_blocked());
assert!(ui.get_geometry_error().is_empty());
assert!(ui.get_geometry_valid());
assert!(super::persist_groups(
&ui,
&groups.lock().unwrap(),
*active.lock().unwrap(),
&profile,
));

// Only unfinished stream groups remain: the transitional seed must carry
// the full manual settings even when there is no sizing mirror left.
while groups
Expand Down
6 changes: 6 additions & 0 deletions src/ui/geometry_view.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
use super::*;

pub(super) fn update_geometry_preview(ui: &QuickAccess, displays: &[DisplayOption]) {
if ui.get_geometry_save_blocked() {
return;
}
update_resolution_suggestions(ui);
ui.set_geometry_error("".into());
ui.set_geometry_valid(false);
Expand Down Expand Up @@ -148,6 +151,9 @@ pub(super) fn update_resolution_suggestions(ui: &QuickAccess) {
}

pub(super) fn calculate_geometry(ui: &QuickAccess, displays: &[DisplayOption]) {
if ui.get_geometry_save_blocked() {
return;
}
update_geometry_preview(ui, displays);
if !ui.get_geometry_valid() {
if ui.get_page() != QuickAccessPage::Geometry && !ui.get_geometry_error().is_empty() {
Expand Down
12 changes: 11 additions & 1 deletion src/ui/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ pub(super) fn register_lifecycle_handlers(
let start_state = state.clone();
flyout.on_start(move || {
if let Some(ui) = flyout_weak.upgrade() {
if ui.get_geometry_save_blocked() {
return;
}
let displays = start_state
.displays
.lock()
Expand Down Expand Up @@ -102,7 +105,14 @@ pub(super) fn register_lifecycle_handlers(
let stop_sender = sender.clone();
flyout.on_stop(move || stop_sender.stop());
let restart_sender = sender.clone();
flyout.on_restart_mapping(move || restart_sender.restart_mapping());
let flyout_weak = flyout.as_weak();
flyout.on_restart_mapping(move || {
if let Some(ui) = flyout_weak.upgrade()
&& !ui.get_geometry_save_blocked()
{
restart_sender.restart_mapping();
}
});

let flyout_weak = flyout.as_weak();
let display_settings_error_revision = error_revision.clone();
Expand Down
4 changes: 3 additions & 1 deletion src/ui/projection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ pub(super) fn hydrate_group(
}
ui.set_sizing_strategy(sizing_strategy_index(group.sizing_strategy));
rebuild_reference_options(ui, displays, groups, group.reference_source.clone());
if let Ok(request) = group_sizing_request(group, displays) {
if ui.get_geometry_save_blocked() {
ui.set_geometry_valid(false);
} else if let Ok(request) = group_sizing_request(group, displays) {
match request.calculate() {
Ok(result) => set_geometry_result(ui, result, true),
Err(error) => {
Expand Down
4 changes: 2 additions & 2 deletions ui/quick-access.slint
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ export component QuickAccess inherits Window {
reference-action-enabled: root.reference-action-enabled;
sizing-strategy <=> root.sizing-strategy;
state: root.state;
state-detail: root.state-detail;
state-detail: root.geometry-save-blocked ? "Configuration unavailable" : root.state-detail;
running: root.running;
busy: root.busy;
restart-available: root.restart-available;
error-text: root.error-text;
error-text: root.geometry-save-blocked ? root.geometry-error : root.error-text;
mapping-fps: root.mapping-fps;
mapping-fps-valid: root.mapping-fps-valid;
mapping-fps-error: root.mapping-fps-error;
Expand Down