starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-06 04:55:16 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

fix(bar): check monitor connection on all notifications

Browse Source
This commit is contained in:
alex-ds13
2025-02-08 03:40:16 +00:00
committed by LGUG2Z
parent ec8519d75a
commit b7ebd3fe63
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
komorebi-bar/src/bar.rs
+40 -40
View File
@@ -673,50 +673,50 @@ impl eframe::App for Komobar {
} }
}, },
Ok(KomorebiEvent::Notification(notification)) => { Ok(KomorebiEvent::Notification(notification)) => {
let state = &notification.state;
let usr_monitor_index = match &self.config.monitor {
MonitorConfigOrIndex::MonitorConfig(monitor_config) => monitor_config.index,
MonitorConfigOrIndex::Index(idx) => *idx,
};
let monitor_index = state
.monitor_usr_idx_map
.get(&usr_monitor_index)
.map_or(usr_monitor_index, |i| *i);
self.monitor_index = monitor_index;
if self.monitor_index >= state.monitors.elements().len() {
// Monitor for this bar got disconnected lets disable the bar until it
// reconnects
self.disabled = true;
tracing::warn!(
"This bar's monitor got disconnected. The bar will be disabled until it reconnects..."
);
return;
} else {
if self.disabled {
tracing::info!(
"This bar's monitor reconnected. The bar will be enabled again!"
);
// Restore the bar in case it has been minimized when the monitor
// disconnected
if let Some(hwnd) = self.hwnd {
let window = komorebi_client::Window::from(hwnd);
if window.is_miminized() {
komorebi_client::WindowsApi::restore_window(hwnd);
}
}
// Reposition the Bar
self.position_bar();
}
self.disabled = false;
}
let should_apply_config = if matches!( let should_apply_config = if matches!(
notification.event, notification.event,
NotificationEvent::Monitor(MonitorNotification::DisplayConnectionChange) NotificationEvent::Monitor(MonitorNotification::DisplayConnectionChange)
) { ) {
let state = &notification.state;
let usr_monitor_index = match &self.config.monitor {
MonitorConfigOrIndex::MonitorConfig(monitor_config) => monitor_config.index,
MonitorConfigOrIndex::Index(idx) => *idx,
};
let monitor_index = state
.monitor_usr_idx_map
.get(&usr_monitor_index)
.map_or(usr_monitor_index, |i| *i);
self.monitor_index = monitor_index;
if self.monitor_index >= state.monitors.elements().len() {
// Monitor for this bar got disconnected lets disable the bar until it
// reconnects
self.disabled = true;
tracing::warn!(
"This bar's monitor got disconnected. The bar will be disabled until it reconnects..."
);
return;
} else {
if self.disabled {
tracing::info!(
"This bar's monitor reconnected. The bar will be enabled again!"
);
// Restore the bar in case it has been minimized when the monitor
// disconnected
if let Some(hwnd) = self.hwnd {
let window = komorebi_client::Window::from(hwnd);
if window.is_miminized() {
komorebi_client::WindowsApi::restore_window(hwnd);
}
}
// Reposition the Bar
self.position_bar();
}
self.disabled = false;
}
// Store the monitor coordinates in case they've changed // Store the monitor coordinates in case they've changed
MONITOR_RIGHT.store( MONITOR_RIGHT.store(
state.monitors.elements()[self.monitor_index].size().right, state.monitors.elements()[self.monitor_index].size().right,