aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Window.cc13
1 files 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) {
2192 */ 2192 */
2193void FluxboxWindow::popupMenu() { 2193void FluxboxWindow::popupMenu() {
2194 2194
2195 int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth();
2196 if (!decorations.titlebar) // if we don't have any titlebar
2197 menu_y = 0;
2198 if (m_last_button_x < x() || m_last_button_x > x() + static_cast<signed>(width())) 2195 if (m_last_button_x < x() || m_last_button_x > x() + static_cast<signed>(width()))
2199 m_last_button_x = x(); 2196 m_last_button_x = x();
2200 2197
2201 popupMenu(m_last_button_x, menu_y + frame().y()); 2198 popupMenu(m_last_button_x, frame().titlebarHeight() + frame().y());
2202} 2199}
2203 2200
2204 2201
@@ -3729,13 +3726,7 @@ unsigned int FluxboxWindow::normalHeight() const {
3729int FluxboxWindow::initialState() const { return m_client->initial_state; } 3726int FluxboxWindow::initialState() const { return m_client->initial_state; }
3730 3727
3731void FluxboxWindow::fixsize(int *user_w, int *user_h, bool maximizing) { 3728void FluxboxWindow::fixsize(int *user_w, int *user_h, bool maximizing) {
3732 int titlebar_height = (decorations.titlebar ? 3729 int decoration_height = frame().titlebarHeight() + frame().handleHeight();
3733 frame().titlebar().height() +
3734 frame().titlebar().borderWidth() : 0);
3735 int handle_height = (decorations.handle ?
3736 frame().handle().height() +
3737 frame().handle().borderWidth() : 0);
3738 int decoration_height = titlebar_height + handle_height;
3739 3730
3740 // dx is new width = current width + difference between new and old x values 3731 // dx is new width = current width + difference between new and old x values
3741 //int dx = frame().width() + frame().x() - m_last_resize_x; 3732 //int dx = frame().width() + frame().x() - m_last_resize_x;