diff options
author | 2018-07-25 21:30:56 -0400 | |
---|---|---|
committer | 2018-07-25 21:30:56 -0400 | |
commit | 75ebeb4a167ca218af37fa9041223a6450dc20f4 (patch) | |
tree | 47456198945ceea9f105dc9122ebbdf2013872ce /include | |
parent | Merge pull request #2330 from progandy/set-modifier-locks (diff) | |
parent | Fix indent (diff) | |
download | sway-75ebeb4a167ca218af37fa9041223a6450dc20f4.tar.gz sway-75ebeb4a167ca218af37fa9041223a6450dc20f4.tar.zst sway-75ebeb4a167ca218af37fa9041223a6450dc20f4.zip |
Merge pull request #2356 from RyanDwyer/fullscreen-containers
Allow containers to be fullscreen
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 23 | ||||
-rw-r--r-- | include/sway/tree/view.h | 6 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 2 |
3 files changed, 22 insertions, 9 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 2a4be18c..c584cd92 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -60,6 +60,8 @@ struct sway_container_state { | |||
60 | double swayc_x, swayc_y; | 60 | double swayc_x, swayc_y; |
61 | double swayc_width, swayc_height; | 61 | double swayc_width, swayc_height; |
62 | 62 | ||
63 | bool is_fullscreen; | ||
64 | |||
63 | bool has_gaps; | 65 | bool has_gaps; |
64 | double current_gaps; | 66 | double current_gaps; |
65 | double gaps_inner; | 67 | double gaps_inner; |
@@ -74,7 +76,6 @@ struct sway_container_state { | |||
74 | // View properties | 76 | // View properties |
75 | double view_x, view_y; | 77 | double view_x, view_y; |
76 | double view_width, view_height; | 78 | double view_width, view_height; |
77 | bool is_fullscreen; | ||
78 | 79 | ||
79 | enum sway_container_border border; | 80 | enum sway_container_border border; |
80 | int border_thickness; | 81 | int border_thickness; |
@@ -84,7 +85,7 @@ struct sway_container_state { | |||
84 | bool border_right; | 85 | bool border_right; |
85 | 86 | ||
86 | // Workspace properties | 87 | // Workspace properties |
87 | struct sway_view *ws_fullscreen; | 88 | struct sway_container *ws_fullscreen; |
88 | struct sway_container *ws_floating; | 89 | struct sway_container *ws_floating; |
89 | }; | 90 | }; |
90 | 91 | ||
@@ -124,6 +125,8 @@ struct sway_container { | |||
124 | double saved_x, saved_y; | 125 | double saved_x, saved_y; |
125 | double saved_width, saved_height; | 126 | double saved_width, saved_height; |
126 | 127 | ||
128 | bool is_fullscreen; | ||
129 | |||
127 | // The gaps currently applied to the container. | 130 | // The gaps currently applied to the container. |
128 | double current_gaps; | 131 | double current_gaps; |
129 | 132 | ||
@@ -335,4 +338,20 @@ bool container_has_urgent_child(struct sway_container *container); | |||
335 | */ | 338 | */ |
336 | void container_end_mouse_operation(struct sway_container *container); | 339 | void container_end_mouse_operation(struct sway_container *container); |
337 | 340 | ||
341 | void container_set_fullscreen(struct sway_container *container, bool enable); | ||
342 | |||
343 | /** | ||
344 | * Return true if the container is fullscreen, or a child of a fullscreen split | ||
345 | * container. | ||
346 | */ | ||
347 | bool container_is_fullscreen_or_child(struct sway_container *container); | ||
348 | |||
349 | /** | ||
350 | * Wrap the children of parent in a new container. The new container will be the | ||
351 | * only child of parent. | ||
352 | * | ||
353 | * The new container is returned. | ||
354 | */ | ||
355 | struct sway_container *container_wrap_children(struct sway_container *parent); | ||
356 | |||
338 | #endif | 357 | #endif |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 1972447b..7086314f 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -69,8 +69,6 @@ struct sway_view { | |||
69 | // Used when changing a view from tiled to floating. | 69 | // Used when changing a view from tiled to floating. |
70 | int natural_width, natural_height; | 70 | int natural_width, natural_height; |
71 | 71 | ||
72 | bool is_fullscreen; | ||
73 | |||
74 | char *title_format; | 72 | char *title_format; |
75 | enum sway_container_border border; | 73 | enum sway_container_border border; |
76 | int border_thickness; | 74 | int border_thickness; |
@@ -251,10 +249,6 @@ void view_set_activated(struct sway_view *view, bool activated); | |||
251 | 249 | ||
252 | void view_set_tiled(struct sway_view *view, bool tiled); | 250 | void view_set_tiled(struct sway_view *view, bool tiled); |
253 | 251 | ||
254 | void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen); | ||
255 | |||
256 | void view_set_fullscreen(struct sway_view *view, bool fullscreen); | ||
257 | |||
258 | void view_close(struct sway_view *view); | 252 | void view_close(struct sway_view *view); |
259 | 253 | ||
260 | void view_damage_from(struct sway_view *view); | 254 | void view_damage_from(struct sway_view *view); |
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index ff66da6b..5ae0ae3a 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -7,7 +7,7 @@ struct sway_view; | |||
7 | 7 | ||
8 | struct sway_workspace { | 8 | struct sway_workspace { |
9 | struct sway_container *swayc; | 9 | struct sway_container *swayc; |
10 | struct sway_view *fullscreen; | 10 | struct sway_container *fullscreen; |
11 | struct sway_container *floating; | 11 | struct sway_container *floating; |
12 | list_t *output_priority; | 12 | list_t *output_priority; |
13 | bool urgent; | 13 | bool urgent; |