diff options
| author | Aram Drevekenin <aram@poor.dev> | 2024-10-24 10:16:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 10:16:30 +0200 |
| commit | a71b18327a82768dd779c0d8f71c0263642c4861 (patch) | |
| tree | 54b99f424c42f05cbea339155bf98b915eec320f /default-plugins | |
| parent | docs(changelog): grid fix (diff) | |
| download | sl0ppij-a71b18327a82768dd779c0d8f71c0263642c4861.tar.gz sl0ppij-a71b18327a82768dd779c0d8f71c0263642c4861.tar.xz sl0ppij-a71b18327a82768dd779c0d8f71c0263642c4861.zip | |
fix(configuration): leave notification up when base mode changes (#3696)
Diffstat (limited to 'default-plugins')
| -rw-r--r-- | default-plugins/configuration/src/main.rs | 12 | ||||
| -rw-r--r-- | default-plugins/configuration/src/presets_screen.rs | 6 | ||||
| -rw-r--r-- | default-plugins/configuration/src/rebind_leaders_screen.rs | 6 |
3 files changed, 22 insertions, 2 deletions
diff --git a/default-plugins/configuration/src/main.rs b/default-plugins/configuration/src/main.rs index 016dca58..67c7577b 100644 --- a/default-plugins/configuration/src/main.rs +++ b/default-plugins/configuration/src/main.rs @@ -32,8 +32,16 @@ impl Screen { Screen::new_reset_keybindings_screen(Some(0)); } else { match self { - Screen::RebindLeaders(r) => *r = Default::default(), - Screen::Presets(r) => *r = Default::default(), + Screen::RebindLeaders(r) => { + let notification = r.drain_notification(); + *r = Default::default(); + r.set_notification(notification); + }, + Screen::Presets(r) => { + let notification = r.drain_notification(); + *r = Default::default(); + r.set_notification(notification); + }, } } } diff --git a/default-plugins/configuration/src/presets_screen.rs b/default-plugins/configuration/src/presets_screen.rs index af76c36a..0551c895 100644 --- a/default-plugins/configuration/src/presets_screen.rs +++ b/default-plugins/configuration/src/presets_screen.rs @@ -190,6 +190,12 @@ impl PresetsScreen { pub fn reset_selected_index(&mut self) { self.selected_index = Some(0); } + pub fn drain_notification(&mut self) -> Option<String> { + self.notification.take() + } + pub fn set_notification(&mut self, notification: Option<String>) { + self.notification = notification; + } fn reconfigure(&self, selected: usize, write_to_disk: bool) { if selected == 0 { // TODO: these should be part of a "transaction" when they are diff --git a/default-plugins/configuration/src/rebind_leaders_screen.rs b/default-plugins/configuration/src/rebind_leaders_screen.rs index e745cf98..747175ab 100644 --- a/default-plugins/configuration/src/rebind_leaders_screen.rs +++ b/default-plugins/configuration/src/rebind_leaders_screen.rs @@ -680,6 +680,12 @@ impl RebindLeadersScreen { self.handle_default_preset_key(key) } } + pub fn drain_notification(&mut self) -> Option<String> { + self.notification.take() + } + pub fn set_notification(&mut self, notification: Option<String>) { + self.notification = notification; + } fn currently_in_unlock_first(&self) -> bool { if self.is_rebinding_for_presets { false |
