diff options
author | Simon Ser <contact@emersion.fr> | 2020-01-15 17:52:33 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-01-15 17:56:14 +0100 |
commit | 0d2a3fa835c5c0a9ae13f621f5a76cd8b5c9781c (patch) | |
tree | ed1aee6d2d53a045246d93dca82ddd5091e797fb /include | |
parent | container: add inactive fullscreen to focus stack (diff) | |
download | sway-0d2a3fa835c5c0a9ae13f621f5a76cd8b5c9781c.tar.gz sway-0d2a3fa835c5c0a9ae13f621f5a76cd8b5c9781c.tar.zst sway-0d2a3fa835c5c0a9ae13f621f5a76cd8b5c9781c.zip |
Revert "Make all the container dimensions integers"
This reverts commit 79c5f5ba1245a8c3d575770419a6501447e78919.
Fixes: https://github.com/swaywm/sway/issues/4908
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index b31c6e7c..62c6556b 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -41,8 +41,8 @@ enum wlr_direction; | |||
41 | struct sway_container_state { | 41 | struct sway_container_state { |
42 | // Container properties | 42 | // Container properties |
43 | enum sway_container_layout layout; | 43 | enum sway_container_layout layout; |
44 | int x, y; | 44 | double x, y; |
45 | int width, height; | 45 | double width, height; |
46 | 46 | ||
47 | enum sway_fullscreen_mode fullscreen_mode; | 47 | enum sway_fullscreen_mode fullscreen_mode; |
48 | 48 | ||
@@ -60,8 +60,8 @@ struct sway_container_state { | |||
60 | bool border_left; | 60 | bool border_left; |
61 | bool border_right; | 61 | bool border_right; |
62 | 62 | ||
63 | int content_x, content_y; | 63 | double content_x, content_y; |
64 | int content_width, content_height; | 64 | double content_width, content_height; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | struct sway_container { | 67 | struct sway_container { |
@@ -83,10 +83,10 @@ struct sway_container { | |||
83 | // For C_ROOT, this has no meaning | 83 | // For C_ROOT, this has no meaning |
84 | // For other types, this is the position in layout coordinates | 84 | // For other types, this is the position in layout coordinates |
85 | // Includes borders | 85 | // Includes borders |
86 | int x, y; | 86 | double x, y; |
87 | int width, height; | 87 | double width, height; |
88 | int saved_x, saved_y; | 88 | double saved_x, saved_y; |
89 | int saved_width, saved_height; | 89 | double saved_width, saved_height; |
90 | 90 | ||
91 | // The share of the space of parent container this container occupies | 91 | // The share of the space of parent container this container occupies |
92 | double width_fraction; | 92 | double width_fraction; |
@@ -98,14 +98,14 @@ struct sway_container { | |||
98 | double child_total_height; | 98 | double child_total_height; |
99 | 99 | ||
100 | // These are in layout coordinates. | 100 | // These are in layout coordinates. |
101 | int content_x, content_y; | 101 | double content_x, content_y; |
102 | int content_width, content_height; | 102 | int content_width, content_height; |
103 | 103 | ||
104 | // In most cases this is the same as the content x and y, but if the view | 104 | // In most cases this is the same as the content x and y, but if the view |
105 | // refuses to resize to the content dimensions then it can be smaller. | 105 | // refuses to resize to the content dimensions then it can be smaller. |
106 | // These are in layout coordinates. | 106 | // These are in layout coordinates. |
107 | int surface_x, surface_y; | 107 | double surface_x, surface_y; |
108 | int surface_width, surface_height; | 108 | double surface_width, surface_height; |
109 | 109 | ||
110 | enum sway_fullscreen_mode fullscreen_mode; | 110 | enum sway_fullscreen_mode fullscreen_mode; |
111 | 111 | ||