mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Pedro Côrte-Real 2019-07-28 12:19:34 +01:00 committed by Drew DeVault
parent bd1fb76e0f
commit 79c5f5ba12
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/sway/tree/container.h
View File

@ -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;