nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hide menus when clicking title or toolbar

Browse source 
BUG: 1149
This commit is contained in:
Thomas Lübking 2016-09-03 22:35:38 +02:00
parent 6c2641404a
commit 36993a80f4
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/IconbarTool.cc
View file

@ -194,6 +194,7 @@ class ShowMenu: public FbTk::Command<void> {
public:
explicit ShowMenu(FluxboxWindow &win):m_win(win) { }
void execute() {
FbTk::Menu::hideShownMenu();
// get last button pos
const XEvent &e = Fluxbox::instance()->lastEvent();
m_win.popupMenu(e.xbutton.x_root, e.xbutton.y_root);
@ -206,6 +207,7 @@ class FocusCommand: public FbTk::Command<void> {
public:
explicit FocusCommand(Focusable &win): m_win(win) { }
void execute() {
FbTk::Menu::hideShownMenu();
// this needs to be a local variable, as this object could be destroyed
// if the workspace is changed.
FluxboxWindow *fbwin = m_win.fbwindow();

3
src/Toolbar.cc
View file

@ -514,6 +514,9 @@ void Toolbar::reconfigure() {
void Toolbar::buttonPressEvent(XButtonEvent &be) {
Display *dpy = Fluxbox::instance()->display();
FbTk::Menu::hideShownMenu();
if (be.subwindow) {
// Do not intercept mouse events that are meant for the tray icon
if (SystemTray::doesControl(be.subwindow)) {

4
src/Window.cc
View file

@ -2415,6 +2415,8 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
m_last_button_y = be.y_root;
m_last_pressed_button = be.button;
FbTk::Menu::hideShownMenu();
Keys *k = Fluxbox::instance()->keys();
int context = 0;
context = frame().getContext(be.subwindow ? be.subwindow : be.window, be.x_root, be.y_root);
@ -2448,7 +2450,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
m_button_grab_x = be.x_root - frame().x() - frame().window().borderWidth();
m_button_grab_y = be.y_root - frame().y() - frame().window().borderWidth();
}
FbTk::Menu::hideShownMenu();
if (!m_focused && acceptsFocus() && m_click_focus)
focus();