zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 19:34:24 +02:00
Code Activity

Merge pull request #271 from JakeStanger/fix/launcher-popup

Browse source 
fix(launcher): popup not closing when hover leaves widget
This commit is contained in:
Jake Stanger 2023-08-13 15:21:47 +01:00 • committed by GitHub
commit baeb4eae74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/modules/launcher/item.rs
View file

@ -1,5 +1,6 @@
use super::open_state::OpenState;
use crate::clients::wayland::ToplevelHandle;
use crate::config::BarPosition;
use crate::gtk_helpers::IronbarGtkExt;
use crate::image::ImageProvider;
use crate::modules::launcher::{ItemEvent, LauncherUpdate};
@ -7,7 +8,7 @@ use crate::modules::ModuleUpdateEvent;
use crate::{read_lock, try_send};
use color_eyre::{Report, Result};
use gtk::prelude::*;
use gtk::{Button, IconTheme, Orientation};
use gtk::{Button, IconTheme};
use indexmap::IndexMap;
use std::rc::Rc;
use std::sync::RwLock;
@ -176,7 +177,7 @@ impl ItemButton {
item: &Item,
appearance: AppearanceOptions,
icon_theme: &IconTheme,
orientation: Orientation,
bar_position: BarPosition,
tx: &Sender<ModuleUpdateEvent<LauncherUpdate>>,
controller_tx: &Sender<ItemEvent>,
) -> Self {
@ -249,7 +250,9 @@ impl ItemButton {
try_send!(
tx,
ModuleUpdateEvent::OpenPopupAt(button.geometry(orientation))
ModuleUpdateEvent::OpenPopupAt(
button.geometry(bar_position.get_orientation())
)
);
} else {
try_send!(tx, ModuleUpdateEvent::ClosePopup);
@ -259,6 +262,31 @@ impl ItemButton {
});
}
{
let tx = tx.clone();
button.connect_leave_notify_event(move |button, ev| {
const THRESHOLD: f64 = 5.0;
let alloc = button.allocation();
let (x, y) = ev.position();
let close = match bar_position {
BarPosition::Top => y + THRESHOLD < alloc.height() as f64,
BarPosition::Bottom => y > 0.0,
BarPosition::Left => x + THRESHOLD < alloc.width() as f64,
BarPosition::Right => x > THRESHOLD,
};
if close {
try_send!(tx, ModuleUpdateEvent::ClosePopup);
}
Inhibit(false)
});
}
button.show_all();
Self {

4
src/modules/launcher/mod.rs
View file

@ -334,7 +334,7 @@ impl Module<gtk::Box> for LauncherModule {
};
let show_names = self.show_names;
let orientation = info.bar_position.get_orientation();
let bar_position = info.bar_position;
let mut buttons = IndexMap::<String, ItemButton>::new();
@ -350,7 +350,7 @@ impl Module<gtk::Box> for LauncherModule {
&item,
appearance_options,
&icon_theme,
orientation,
bar_position,
&context.tx,
&controller_tx,
);