From 11a066ec1374e198fbae361aea6d8e967eefbc53 Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Thu, 5 Jun 2008 04:04:43 -0700 Subject: some fixes for borderless windows --- src/Window.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Window.cc b/src/Window.cc index b9a454b..e56f735 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -2192,13 +2192,10 @@ void FluxboxWindow::popupMenu(int x, int y) { */ 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() + static_cast(width())) m_last_button_x = x(); - popupMenu(m_last_button_x, menu_y + frame().y()); + popupMenu(m_last_button_x, frame().titlebarHeight() + frame().y()); } @@ -3729,13 +3726,7 @@ unsigned int FluxboxWindow::normalHeight() const { int FluxboxWindow::initialState() const { return m_client->initial_state; } void FluxboxWindow::fixsize(int *user_w, int *user_h, bool maximizing) { - int titlebar_height = (decorations.titlebar ? - frame().titlebar().height() + - frame().titlebar().borderWidth() : 0); - int handle_height = (decorations.handle ? - frame().handle().height() + - frame().handle().borderWidth() : 0); - int decoration_height = titlebar_height + handle_height; + int decoration_height = frame().titlebarHeight() + frame().handleHeight(); // dx is new width = current width + difference between new and old x values //int dx = frame().width() + frame().x() - m_last_resize_x; -- cgit v0.11.2