strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

fix: excess popup windows

Browse Source 
Previously a popup window was created for each section of each bar.
This reduces it to a single popup window per bar.

Fixes #150.
This commit is contained in:
Jake Stanger
2023-05-20 13:17:07 +01:00
parent 91ed1ee384
commit 0e65f93a23
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bar.rs
View File

@@ -163,19 +163,23 @@ fn load_modules(
};
}
// popup ignores module location so can bodge this for now
let popup = Popup::new(&info!(ModuleLocation::Left), config.popup_gap);
let popup = Arc::new(RwLock::new(popup));
if let Some(modules) = config.start {
let info = info!(ModuleLocation::Left);
add_modules(left, modules, &info, config.popup_gap)?;
add_modules(left, modules, &info, &popup)?;
}
if let Some(modules) = config.center {
let info = info!(ModuleLocation::Center);
add_modules(center, modules, &info, config.popup_gap)?;
add_modules(center, modules, &info, &popup)?;
}
if let Some(modules) = config.end {
let info = info!(ModuleLocation::Right);
add_modules(right, modules, &info, config.popup_gap)?;
add_modules(right, modules, &info, &popup)?;
}
Ok(())
@@ -187,11 +191,8 @@ fn add_modules(
content: &gtk::Box,
modules: Vec<ModuleConfig>,
info: &ModuleInfo,
popup_gap: i32,
popup: &Arc<RwLock<Popup>>,
) -> Result<()> {
let popup = Popup::new(info, popup_gap);
let popup = Arc::new(RwLock::new(popup));
let orientation = info.bar_position.get_orientation();
macro_rules! add_module {