mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-08-16 22:31:03 +02:00
Merge pull request #814 from BowDown097/master
feat(launcher): open new window on middle-click
This commit is contained in:
commit
cfaa99830f
2 changed files with 20 additions and 11 deletions
|
@ -3,7 +3,8 @@
|
|||
|
||||
Windows-style taskbar that displays running windows, grouped by program.
|
||||
Hovering over a program with multiple windows open shows a popup with each window.
|
||||
Clicking an icon/popup item focuses or launches the program.
|
||||
Left clicking an icon/popup item focuses the program if it has any open instances or otherwise launches a new instance of the program.
|
||||
Middle clicking an icon always launches a new instance of the program.
|
||||
Optionally displays a launchable set of favourites.
|
||||
|
||||

|
||||
|
@ -113,4 +114,4 @@ start:
|
|||
| `.popup-launcher` | Popup container |
|
||||
| `.popup-launcher .popup-item` | Window button in popup |
|
||||
|
||||
For more information on styling, please see the [styling guide](styling-guide).
|
||||
For more information on styling, please see the [styling guide](styling-guide).
|
||||
|
|
|
@ -7,6 +7,7 @@ use crate::modules::launcher::{ItemEvent, LauncherUpdate};
|
|||
use crate::modules::ModuleUpdateEvent;
|
||||
use crate::{read_lock, try_send};
|
||||
use glib::Propagation;
|
||||
use gtk::gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY};
|
||||
use gtk::prelude::*;
|
||||
use gtk::{Button, IconTheme, Image, Label, Orientation};
|
||||
use indexmap::IndexMap;
|
||||
|
@ -201,20 +202,27 @@ impl ItemButton {
|
|||
let app_id = item.app_id.clone();
|
||||
let tx = controller_tx.clone();
|
||||
let menu_state = menu_state.clone();
|
||||
button.connect_clicked(move |button| {
|
||||
// lazy check :| TODO: Improve this
|
||||
let style_context = button.style_context();
|
||||
if style_context.has_class("open") {
|
||||
let menu_state = read_lock!(menu_state);
|
||||
|
||||
if style_context.has_class("focused") && menu_state.num_windows == 1 {
|
||||
try_send!(tx, ItemEvent::MinimizeItem(app_id.clone()));
|
||||
button.connect_button_release_event(move |button, event| {
|
||||
if event.button() == BUTTON_PRIMARY {
|
||||
// lazy check :| TODO: Improve this
|
||||
let style_context = button.style_context();
|
||||
if style_context.has_class("open") {
|
||||
let menu_state = read_lock!(menu_state);
|
||||
|
||||
if style_context.has_class("focused") && menu_state.num_windows == 1 {
|
||||
try_send!(tx, ItemEvent::MinimizeItem(app_id.clone()));
|
||||
} else {
|
||||
try_send!(tx, ItemEvent::FocusItem(app_id.clone()));
|
||||
}
|
||||
} else {
|
||||
try_send!(tx, ItemEvent::FocusItem(app_id.clone()));
|
||||
try_send!(tx, ItemEvent::OpenItem(app_id.clone()));
|
||||
}
|
||||
} else {
|
||||
} else if event.button() == BUTTON_MIDDLE {
|
||||
try_send!(tx, ItemEvent::OpenItem(app_id.clone()));
|
||||
}
|
||||
|
||||
Propagation::Proceed
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue