Merge branch 'master' of github.com:SirCmpwn/sway into fix-swaybar-in-08bef67

2 files changed, 8 insertions, 0 deletions

diff --git a/include/config.h b/include/config.h
index 3c1957b6..1a6ba19d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -226,6 +226,12 @@ struct sway_config {
                 struct border_colors placeholder;
                 uint32_t background;
         } border_colors;
+
+        // floating view minimum
+        int32_t floating_maximum_width;
+        int32_t floating_maximum_height;
+        int32_t floating_minimum_width;
+        int32_t floating_minimum_height;
 };
 
 /**
diff --git a/include/container.h b/include/container.h
index d1905720..50ca2bf5 100644
--- a/include/container.h
+++ b/include/container.h
@@ -168,6 +168,8 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle);
  */
 swayc_t *new_floating_view(wlc_handle handle);
 
+void floating_view_sane_size(swayc_t *view);
+
 /**
  * Frees an output's container.
  */