1 files changed, 37 insertions, 6 deletions

diff --git a/sway/tree/view.c b/sway/tree/view.c
index c96b6a97..f99def6c 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -150,12 +150,43 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
 
 void view_init_floating(struct sway_view *view) {
         struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
-        int max_width = ws->width * 0.6666;
-        int max_height = ws->height * 0.6666;
-        view->width =
-                view->natural_width > max_width ? max_width : view->natural_width;
-        view->height =
-                view->natural_height > max_height ? max_height : view->natural_height;
+        int min_width, min_height;
+        int max_width, max_height;
+
+        if (config->floating_minimum_width == -1) { // no minimum
+                min_width = 0;
+        } else if (config->floating_minimum_width == 0) { // automatic
+                min_width = 75;
+        } else {
+                min_width = config->floating_minimum_width;
+        }
+
+        if (config->floating_minimum_height == -1) { // no minimum
+                min_height = 0;
+        } else if (config->floating_minimum_height == 0) { // automatic
+                min_height = 50;
+        } else {
+                min_height = config->floating_minimum_height;
+        }
+
+        if (config->floating_maximum_width == -1) { // no maximum
+                max_width = INT_MAX;
+        } else if (config->floating_maximum_width == 0) { // automatic
+                max_width = ws->width * 0.6666;
+        } else {
+                max_width = config->floating_maximum_width;
+        }
+
+        if (config->floating_maximum_height == -1) { // no maximum
+                max_height = INT_MAX;
+        } else if (config->floating_maximum_height == 0) { // automatic
+                max_height = ws->height * 0.6666;
+        } else {
+                max_height = config->floating_maximum_height;
+        }
+
+        view->width = fmax(min_width, fmin(view->natural_width, max_width));
+        view->height = fmax(min_height, fmin(view->natural_height, max_height));
         view->x = ws->x + (ws->width - view->width) / 2;
         view->y = ws->y + (ws->height - view->height) / 2;