From cd9d9941e6a1a132a16df19ea1eca65f49361133 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Sat, 17 Jan 2004 00:49:20 +0000 Subject: minor fixes, fixed popupMenu position if m_last_button_x is outside window --- src/Window.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Window.cc b/src/Window.cc index 5f024bd..8a3bb31 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.cc,v 1.261 2004/01/16 11:58:45 fluxgen Exp $ +// $Id: Window.cc,v 1.262 2004/01/17 00:49:20 fluxgen Exp $ #include "Window.hh" @@ -1942,7 +1942,8 @@ void FluxboxWindow::popupMenu() { int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth(); if (!decorations.titlebar) // if we don't have any titlebar menu_y = 0; - + if (m_last_button_x < x() || m_last_button_x > x() + width()) + m_last_button_x = x(); showMenu(m_last_button_x, menu_y + frame().y()); } @@ -3328,8 +3329,6 @@ void FluxboxWindow::setupWindow() { WinButtonTheme &winbutton_theme = screen().winButtonTheme(); - typedef FbTk::RefCount<FbTk::Command> CommandRef; - using namespace FbTk; typedef RefCount<Command> CommandRef; typedef SimpleCommand<FluxboxWindow> WindowCmd; -- cgit v0.11.2