Skip to content

Commit

Permalink
Revert "Make all the container dimensions integers"
Browse files Browse the repository at this point in the history
This reverts commit 79c5f5b.

Fixes: #4908
  • Loading branch information
emersion committed Jan 15, 2020
1 parent 764a270 commit bdcec5a
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions include/sway/tree/container.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ enum wlr_direction;
struct sway_container_state {
// Container properties
enum sway_container_layout layout;
int x, y;
int width, height;
double x, y;
double width, height;

enum sway_fullscreen_mode fullscreen_mode;

Expand All @@ -60,8 +60,8 @@ struct sway_container_state {
bool border_left;
bool border_right;

int content_x, content_y;
int content_width, content_height;
double content_x, content_y;
double content_width, content_height;
};

struct sway_container {
Expand All @@ -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
int x, y;
int width, height;
int saved_x, saved_y;
int saved_width, saved_height;
double x, y;
double width, height;
double saved_x, saved_y;
double saved_width, saved_height;

// The share of the space of parent container this container occupies
double width_fraction;
Expand All @@ -98,14 +98,14 @@ struct sway_container {
double child_total_height;

// These are in layout coordinates.
int content_x, content_y;
double 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.
int surface_x, surface_y;
int surface_width, surface_height;
double surface_x, surface_y;
double surface_width, surface_height;

enum sway_fullscreen_mode fullscreen_mode;

Expand Down

0 comments on commit bdcec5a

Please sign in to comment.