summaryrefslogtreecommitdiffstats
path: root/include/config.h
diff options
context:
space:
mode:
authorLibravatar Zandr Martin <zandrmartin+git@gmail.com>2016-05-31 09:30:34 -0500
committerLibravatar Zandr Martin <zandrmartin+git@gmail.com>2016-05-31 09:30:34 -0500
commit8a81f524502f1948f8f0ef1e98708f2662c34bc1 (patch)
treeddc3a22aa83574abaf17f7e63ecde76745dbc458 /include/config.h
parentfix swaybar problem in 08bef67 (diff)
parentMerge pull request #685 from thuck/floating_size (diff)
downloadsway-8a81f524502f1948f8f0ef1e98708f2662c34bc1.tar.gz
sway-8a81f524502f1948f8f0ef1e98708f2662c34bc1.tar.zst
sway-8a81f524502f1948f8f0ef1e98708f2662c34bc1.zip
Merge branch 'master' of github.com:SirCmpwn/sway into fix-swaybar-in-08bef67
Diffstat (limited to 'include/config.h')
-rw-r--r--include/config.h6
1 files changed, 6 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 {
226 struct border_colors placeholder; 226 struct border_colors placeholder;
227 uint32_t background; 227 uint32_t background;
228 } border_colors; 228 } border_colors;
229
230 // floating view minimum
231 int32_t floating_maximum_width;
232 int32_t floating_maximum_height;
233 int32_t floating_minimum_width;
234 int32_t floating_minimum_height;
229}; 235};
230 236
231/** 237/**