aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-05-25 09:26:23 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-06-01 23:14:58 +1000
commitaaba7642b3e4e9a63aea49412b10221f399b17af (patch)
tree7e7c2f6fcd80a6a48e07e07e03c5f2dc0d248240 /sway/desktop
parent34f35f0badc767d9b0cbaf2fd429af1d30592d08 (diff)
downloadsway-aaba7642b3e4e9a63aea49412b10221f399b17af.tar.xz
Replace is_floating boolean with function
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/desktop/xdg_shell.c2
-rw-r--r--sway/desktop/xdg_shell_v6.c2
-rw-r--r--sway/desktop/xwayland.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index e91be4d4..4e5d106f 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -1147,7 +1147,7 @@ void output_damage_whole_container(struct sway_output *output,
.width = con->width,
.height = con->height,
};
- if (con->is_floating) {
+ if (container_is_floating(con)) {
box.x -= output->wlr_output->lx;
box.y -= output->wlr_output->ly;
}
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index e1a73b20..ebb12211 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -185,7 +185,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
view->natural_width = geometry->width;
view->natural_height = geometry->height;
}
- if (view->swayc && view->swayc->is_floating) {
+ if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, geometry->width, geometry->height);
} else {
view_update_size(view, xdg_shell_view->pending_width,
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 47e4162a..f3df2fe8 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -184,7 +184,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
view->natural_width = geometry->width;
view->natural_height = geometry->height;
}
- if (view->swayc && view->swayc->is_floating) {
+ if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, geometry->width, geometry->height);
} else {
view_update_size(view, xdg_shell_v6_view->pending_width,
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 56cac1bd..1373d968 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -163,7 +163,7 @@ static void configure(struct sway_view *view, double x, double y, int width,
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
double lx, ly;
- if (view->swayc->is_floating) {
+ if (container_is_floating(view->swayc)) {
lx = x;
ly = y;
} else {
@@ -288,7 +288,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
view->natural_width = xsurface->width;
view->natural_height = xsurface->height;
}
- if (view->swayc && view->swayc->is_floating) {
+ if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, xsurface->width, xsurface->height);
view_update_position(view, xsurface->x, xsurface->y);
} else {