move size hints to a struct

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() {
 
     if ((m_client->normal_hint_flags & PMinSize) &&
         (m_client->normal_hint_flags & PMaxSize) &&
-        m_client->max_width != 0 && m_client->max_width <= m_client->min_width &&
-        m_client->max_height != 0 && m_client->max_height <= m_client->min_height) {
+        m_client->maxWidth() != 0 && m_client->maxHeight() != 0 &&
+        m_client->maxWidth() <= m_client->minWidth() &&
+        m_client->maxHeight() <= m_client->minHeight()) {
         decorations.maximize = decorations.handle =
             functions.resize = functions.maximize = false;
         decorations.tab = false; //no tab for this window
@@ -2391,19 +2392,20 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
 #ifdef DEBUG
         cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl;
 #endif // DEBUG
-        unsigned int old_max_width = client.max_width;
-        unsigned int old_min_width = client.min_width;
-        unsigned int old_min_height = client.min_height;
-        unsigned int old_max_height = client.max_height;
+        unsigned int old_max_width = client.maxWidth();
+        unsigned int old_min_width = client.minWidth();
+        unsigned int old_min_height = client.minHeight();
+        unsigned int old_max_height = client.maxHeight();
         bool changed = false;
         client.updateWMNormalHints();
 
-        if (client.min_width != old_min_width ||
-            client.max_width != old_max_width ||
-            client.min_height != old_min_height ||
-            client.max_height != old_max_height) {
-            if (client.max_width != 0 && client.max_width <= client.min_width &&
-                client.max_height != 0 && client.max_height <= client.min_height) {
+        if (client.minWidth() != old_min_width ||
+            client.maxWidth() != old_max_width ||
+            client.minHeight() != old_min_height ||
+            client.maxHeight() != old_max_height) {
+            if (client.maxWidth() != 0 && client.maxHeight() != 0 &&
+                client.maxWidth() <= client.minWidth() &&
+                client.maxHeight() <= client.minHeight()) {
                 if (decorations.maximize ||
                     decorations.handle ||
                     functions.resize ||