Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use absolute view geometry to calculate position #1075

Merged
merged 1 commit into from
Feb 14, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sway/container.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,23 +346,23 @@ swayc_t *new_floating_view(wlc_handle handle) {
view->sticky = false;

// Set the geometry of the floating view
struct wlc_geometry geometry;
wlc_view_get_visible_geometry(handle, &geometry);
const struct wlc_geometry *geometry = wlc_view_get_geometry(handle);

// give it requested geometry, but place in center if possible
// in top left otherwise
if (geometry.size.w != 0) {
view->x = (swayc_active_workspace()->width - geometry.size.w) / 2;
if (geometry->size.w != 0) {
view->x = (swayc_active_workspace()->width - geometry->size.w) / 2;
} else {
view->x = 0;
}
if (geometry.size.h != 0) {
view->y = (swayc_active_workspace()->height - geometry.size.h) / 2;
if (geometry->size.h != 0) {
view->y = (swayc_active_workspace()->height - geometry->size.h) / 2;
} else {
view->y = 0;
}
view->width = geometry.size.w;
view->height = geometry.size.h;

view->width = geometry->size.w;
view->height = geometry->size.h;

view->desired_width = view->width;
view->desired_height = view->height;
Expand Down