BasicWindowManager::modify_window(): respect size constraints

canonical · Dec 9, 2019 · e14dd13 · e14dd13
1 parent 80c97f6
commit e14dd13
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/miral/basic_window_manager.cpp b/src/miral/basic_window_manager.cpp
@@ -1057,16 +1057,14 @@ void miral::BasicWindowManager::modify_window(WindowInfo& window_info, WindowSpe
 
     Point new_pos = modifications.top_left().is_set() ? modifications.top_left().value() : window.top_left();
 
-    if (modifications.size().is_set())
-    {
-        place_and_size(window_info, new_pos, modifications.size().value());
-    }
-    else if (modifications.min_width().is_set() || modifications.min_height().is_set() ||
-             modifications.max_width().is_set() || modifications.max_height().is_set() ||
-             modifications.width_inc().is_set() || modifications.height_inc().is_set())
-    {
-        Size new_size = window.size();
-
+    if (modifications.size().is_set() ||
+        modifications.min_width().is_set() || modifications.min_height().is_set() ||
+        modifications.max_width().is_set() || modifications.max_height().is_set() ||
+        modifications.width_inc().is_set() || modifications.height_inc().is_set())
+    {
+        Size new_size = modifications.size().is_set() ?
+            modifications.size().value() :
+            window.size();
         window_info.constrain_resize(new_pos, new_size);
         place_and_size(window_info, new_pos, new_size);
     }