From 1f4b3c91d4ee4ee0948d8d6699cf6b0127a0f79b Mon Sep 17 00:00:00 2001 From: Pedro Côrte-Real Date: Sun, 28 Jul 2019 12:19:34 +0100 Subject: Make all the container dimensions integers Containers are always fixed to the pixel grid so position and size them with integers instead of doubles. Functionally this should be no different since rounding down is already being done on things like layout. But it makes it clear what the intention is and avoids bugs where fractional pixels are used. The translating and moving code is still using doubles because the cursors can have fractional pixels and thus the code is plumbed that way. But that could also probably be changed easily by doing the integer conversions earlier and plumbing with int. --- include/sway/tree/container.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 62c6556b..b31c6e7c 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -41,8 +41,8 @@ enum wlr_direction; struct sway_container_state { // Container properties enum sway_container_layout layout; - double x, y; - double width, height; + int x, y; + int width, height; enum sway_fullscreen_mode fullscreen_mode; @@ -60,8 +60,8 @@ struct sway_container_state { bool border_left; bool border_right; - double content_x, content_y; - double content_width, content_height; + int content_x, content_y; + int content_width, content_height; }; struct sway_container { @@ -83,10 +83,10 @@ struct sway_container { // For C_ROOT, this has no meaning // For other types, this is the position in layout coordinates // Includes borders - double x, y; - double width, height; - double saved_x, saved_y; - double saved_width, saved_height; + int x, y; + int width, height; + int saved_x, saved_y; + int saved_width, saved_height; // The share of the space of parent container this container occupies double width_fraction; @@ -98,14 +98,14 @@ struct sway_container { double child_total_height; // These are in layout coordinates. - double content_x, content_y; + int content_x, content_y; int content_width, content_height; // In most cases this is the same as the content x and y, but if the view // refuses to resize to the content dimensions then it can be smaller. // These are in layout coordinates. - double surface_x, surface_y; - double surface_width, surface_height; + int surface_x, surface_y; + int surface_width, surface_height; enum sway_fullscreen_mode fullscreen_mode; -- cgit v1.2.3-54-g00ecf