zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-11-03 23:11:54 +01:00
Code Activity

Merge pull request #153 from JakeStanger/fix/excess-windows

Browse source 
fix: excess popup windows
This commit is contained in:
Jake Stanger 2023-05-20 13:49:29 +01:00 • committed by GitHub
commit 960da55a05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 { if let Some(modules) = config.start {
let info = info!(ModuleLocation::Left); 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 { if let Some(modules) = config.center {
let info = info!(ModuleLocation::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 { if let Some(modules) = config.end {
let info = info!(ModuleLocation::Right); let info = info!(ModuleLocation::Right);
add_modules(right, modules, &info, config.popup_gap)?; add_modules(right, modules, &info, &popup)?;
} }
Ok(()) Ok(())
@ -187,11 +191,8 @@ fn add_modules(
content: &gtk::Box, content: &gtk::Box,
modules: Vec<ModuleConfig>, modules: Vec<ModuleConfig>,
info: &ModuleInfo, info: &ModuleInfo,
popup_gap: i32, popup: &Arc<RwLock<Popup>>,
) -> Result<()> { ) -> Result<()> {
let popup = Popup::new(info, popup_gap);
let popup = Arc::new(RwLock::new(popup));
let orientation = info.bar_position.get_orientation(); let orientation = info.bar_position.get_orientation();
macro_rules! add_module { macro_rules! add_module {