aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-09-01 08:45:19 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-05 18:01:43 +1000
commit93ff7879f16c5e31c18a37e87b23ee5dcb5a584b (patch)
tree594a58124652ebdddc3076dcb060774e194e2069 /sway
parent7f40b928c7ec5cb6e1296f7527392731ca2aa84a (diff)
Fix output position issue
Looks like the output dimensions need to be set when arranging rather than when a mode is set. Fixes an issue with position of fullscreen views.
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/output.c4
-rw-r--r--sway/tree/arrange.c13
2 files changed, 9 insertions, 8 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index d9c7dbe3..7e9f7b7e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -505,10 +505,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
static void handle_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode);
- output->lx = output->wlr_output->lx;
- output->ly = output->wlr_output->ly;
- wlr_output_effective_resolution(output->wlr_output,
- &output->width, &output->height);
arrange_layers(output);
arrange_output(output);
transaction_commit_dirty();
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index 2cccf65a..edb05f86 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -217,8 +217,8 @@ void arrange_workspace(struct sway_workspace *workspace) {
workspace->x, workspace->y);
if (workspace->fullscreen) {
struct sway_container *fs = workspace->fullscreen;
- fs->x = output->wlr_output->lx;
- fs->y = output->wlr_output->ly;
+ fs->x = output->lx;
+ fs->y = output->ly;
fs->width = output->width;
fs->height = output->height;
arrange_container(fs);
@@ -234,8 +234,13 @@ void arrange_output(struct sway_output *output) {
if (config->reloading) {
return;
}
- // Outputs have no pending x/y/width/height,
- // so all we do here is arrange the workspaces.
+ const struct wlr_box *output_box = wlr_output_layout_get_box(
+ root->output_layout, output->wlr_output);
+ output->lx = output_box->x;
+ output->ly = output_box->y;
+ output->width = output_box->width;
+ output->height = output_box->height;
+
for (int i = 0; i < output->workspaces->length; ++i) {
struct sway_workspace *workspace = output->workspaces->items[i];
arrange_workspace(workspace);