summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-05-31 10:29:44 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-05-31 10:29:44 -0400
commitdf8caa29a71f041a8e94ff410274a598abfe9a81 (patch)
tree9665fbaac9e2f7d099d7c54715404032ea406551 /include
parentMerge pull request #637 from 1ace/fix/ipc-leak (diff)
parentMerge branch 'master' into floating_size (diff)
downloadsway-df8caa29a71f041a8e94ff410274a598abfe9a81.tar.gz
sway-df8caa29a71f041a8e94ff410274a598abfe9a81.tar.zst
sway-df8caa29a71f041a8e94ff410274a598abfe9a81.zip
Merge pull request #685 from thuck/floating_size
Initial work for floating view with sane values
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 {
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/**
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);
168 */ 168 */
169swayc_t *new_floating_view(wlc_handle handle); 169swayc_t *new_floating_view(wlc_handle handle);
170 170
171void floating_view_sane_size(swayc_t *view);
172
171/** 173/**
172 * Frees an output's container. 174 * Frees an output's container.
173 */ 175 */