summaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 0c5ae0f..651b995 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -472,8 +472,9 @@ void FluxboxWindow::init() {
472 472
473 if ((m_client->normal_hint_flags & PMinSize) && 473 if ((m_client->normal_hint_flags & PMinSize) &&
474 (m_client->normal_hint_flags & PMaxSize) && 474 (m_client->normal_hint_flags & PMaxSize) &&
475 m_client->max_width != 0 && m_client->max_width <= m_client->min_width && 475 m_client->maxWidth() != 0 && m_client->maxHeight() != 0 &&
476 m_client->max_height != 0 && m_client->max_height <= m_client->min_height) { 476 m_client->maxWidth() <= m_client->minWidth() &&
477 m_client->maxHeight() <= m_client->minHeight()) {
477 decorations.maximize = decorations.handle = 478 decorations.maximize = decorations.handle =
478 functions.resize = functions.maximize = false; 479 functions.resize = functions.maximize = false;
479 decorations.tab = false; //no tab for this window 480 decorations.tab = false; //no tab for this window
@@ -2391,19 +2392,20 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
2391#ifdef DEBUG 2392#ifdef DEBUG
2392 cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl; 2393 cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl;
2393#endif // DEBUG 2394#endif // DEBUG
2394 unsigned int old_max_width = client.max_width; 2395 unsigned int old_max_width = client.maxWidth();
2395 unsigned int old_min_width = client.min_width; 2396 unsigned int old_min_width = client.minWidth();
2396 unsigned int old_min_height = client.min_height; 2397 unsigned int old_min_height = client.minHeight();
2397 unsigned int old_max_height = client.max_height; 2398 unsigned int old_max_height = client.maxHeight();
2398 bool changed = false; 2399 bool changed = false;
2399 client.updateWMNormalHints(); 2400 client.updateWMNormalHints();
2400 2401
2401 if (client.min_width != old_min_width || 2402 if (client.minWidth() != old_min_width ||
2402 client.max_width != old_max_width || 2403 client.maxWidth() != old_max_width ||
2403 client.min_height != old_min_height || 2404 client.minHeight() != old_min_height ||
2404 client.max_height != old_max_height) { 2405 client.maxHeight() != old_max_height) {
2405 if (client.max_width != 0 && client.max_width <= client.min_width && 2406 if (client.maxWidth() != 0 && client.maxHeight() != 0 &&
2406 client.max_height != 0 && client.max_height <= client.min_height) { 2407 client.maxWidth() <= client.minWidth() &&
2408 client.maxHeight() <= client.minHeight()) {
2407 if (decorations.maximize || 2409 if (decorations.maximize ||
2408 decorations.handle || 2410 decorations.handle ||
2409 functions.resize || 2411 functions.resize ||