diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-26 16:26:10 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | e4e912ea91a5a36d9f17c1730ffbf29707984399 (patch) | |
tree | 7efb328eeabe0154294e6ef4fee216590df04c9c /include/sway/tree | |
parent | Add L_FLOATING back to debug tree (diff) | |
download | sway-e4e912ea91a5a36d9f17c1730ffbf29707984399.tar.gz sway-e4e912ea91a5a36d9f17c1730ffbf29707984399.tar.zst sway-e4e912ea91a5a36d9f17c1730ffbf29707984399.zip |
Store swayc coordinates as layout-local
Diffstat (limited to 'include/sway/tree')
-rw-r--r-- | include/sway/tree/container.h | 3 | ||||
-rw-r--r-- | include/sway/tree/view.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index e4f74b08..4b686040 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -79,8 +79,7 @@ struct sway_container { | |||
79 | bool is_sticky; | 79 | bool is_sticky; |
80 | 80 | ||
81 | // For C_ROOT, this has no meaning | 81 | // For C_ROOT, this has no meaning |
82 | // For C_OUTPUT, this is the output position in layout coordinates | 82 | // For other types, this is the position in layout coordinates |
83 | // For other types, this is the position in output-local coordinates | ||
84 | // Includes borders | 83 | // Includes borders |
85 | double x, y; | 84 | double x, y; |
86 | double width, height; | 85 | double width, height; |
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 7a94b2c2..65a23902 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
@@ -29,7 +29,7 @@ struct sway_view_impl { | |||
29 | const char *(*get_string_prop)(struct sway_view *view, | 29 | const char *(*get_string_prop)(struct sway_view *view, |
30 | enum sway_view_prop prop); | 30 | enum sway_view_prop prop); |
31 | uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop); | 31 | uint32_t (*get_int_prop)(struct sway_view *view, enum sway_view_prop prop); |
32 | void (*configure)(struct sway_view *view, double ox, double oy, int width, | 32 | void (*configure)(struct sway_view *view, double lx, double ly, int width, |
33 | int height); | 33 | int height); |
34 | void (*set_activated)(struct sway_view *view, bool activated); | 34 | void (*set_activated)(struct sway_view *view, bool activated); |
35 | void (*set_tiled)(struct sway_view *view, bool tiled); | 35 | void (*set_tiled)(struct sway_view *view, bool tiled); |
@@ -48,7 +48,7 @@ struct sway_view { | |||
48 | struct sway_container *swayc; // NULL for unmapped views | 48 | struct sway_container *swayc; // NULL for unmapped views |
49 | struct wlr_surface *surface; // NULL for unmapped views | 49 | struct wlr_surface *surface; // NULL for unmapped views |
50 | 50 | ||
51 | // Geometry of the view itself (excludes borders) | 51 | // Geometry of the view itself (excludes borders) in layout coordinates |
52 | double x, y; | 52 | double x, y; |
53 | int width, height; | 53 | int width, height; |
54 | 54 | ||