aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorZandr Martin <zandrmartin+git@gmail.com>2016-05-31 09:30:34 -0500
committerZandr Martin <zandrmartin+git@gmail.com>2016-05-31 09:30:34 -0500
commit8a81f524502f1948f8f0ef1e98708f2662c34bc1 (patch)
treeddc3a22aa83574abaf17f7e63ecde76745dbc458 /include
parent1b4d61662c1deddbf48c3392e40f6ac6a888bc90 (diff)
parentdf8caa29a71f041a8e94ff410274a598abfe9a81 (diff)
downloadsway-8a81f524502f1948f8f0ef1e98708f2662c34bc1.tar.xz
Merge branch 'master' of github.com:SirCmpwn/sway into fix-swaybar-in-08bef67
Diffstat (limited to 'include')
-rw-r--r--include/config.h6
-rw-r--r--include/container.h2
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.
*/