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.

Sign up for GitHub

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

view: adjust position according to declared top left corner #365

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

view: adjust position according to declared top left corner #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 14 additions & 9 deletions view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,21 @@ view_activate(struct cg_view *view, bool activate)
static bool
view_extends_output_layout(struct cg_view *view, struct wlr_box *layout_box)
{
int width, height;
view->impl->get_geometry(view, &width, &height);
struct wlr_box view_box;
view->impl->get_geometry(view, &view_box);

return (layout_box->height < height || layout_box->width < width);
return (layout_box->height < view_box.height || layout_box->width < view_box.width);
}

static void
view_maximize(struct cg_view *view, struct wlr_box *layout_box)
{
view->lx = layout_box->x;
view->ly = layout_box->y;
struct wlr_box view_box;
view->impl->get_geometry(view, &view_box);

// Do not forget to adjust position according to top left corner declared in view geometry
view->lx = layout_box->x - view_box.x;
view->ly = layout_box->y - view_box.y;
Comment on lines +67 to +72
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I'm not sure this is the correct spot to read the window geometry. The window geometry is likely to change when the client redraws in the maximized state. This function runs before though, when we send the event to ask the client to redraw itself maximized.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emersion, I understand the client may adjust geometry using xdg_surface::set_window_geometry() before calling (again) wl_surface::commit(). wlroots then calls the handler for map event and in Cage view_map(), view_position() and finally view_maximize() or view_center() where the new geometry can be accessed.


if (view->scene_tree) {
wlr_scene_node_set_position(&view->scene_tree->node, view->lx, view->ly);
Expand All @@ -77,11 +81,12 @@ view_maximize(struct cg_view *view, struct wlr_box *layout_box)
static void
view_center(struct cg_view *view, struct wlr_box *layout_box)
{
int width, height;
view->impl->get_geometry(view, &width, &height);
struct wlr_box view_box;
view->impl->get_geometry(view, &view_box);

view->lx = (layout_box->width - width) / 2;
view->ly = (layout_box->height - height) / 2;
// Do not forget to adjust position according to top left corner declared in view geometry
view->lx = (layout_box->width - view_box.width) / 2 - view_box.x;
view->ly = (layout_box->height - view_box.height) / 2 - view_box.y;

if (view->scene_tree) {
wlr_scene_node_set_position(&view->scene_tree->node, view->lx, view->ly);
Expand Down
2 changes: 1 addition & 1 deletion view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ struct cg_view {

struct cg_view_impl {
char *(*get_title)(struct cg_view *view);
void (*get_geometry)(struct cg_view *view, int *width_out, int *height_out);
void (*get_geometry)(struct cg_view *view, struct wlr_box *view_box);
bool (*is_primary)(struct cg_view *view);
bool (*is_transient_for)(struct cg_view *child, struct cg_view *parent);
void (*activate)(struct cg_view *view, bool activate);
Expand Down
8 changes: 2 additions & 6 deletions xdg_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,10 @@ get_title(struct cg_view *view)
}

static void
get_geometry(struct cg_view *view, int *width_out, int *height_out)
get_geometry(struct cg_view *view, struct wlr_box *view_box)
{
struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view);
struct wlr_box geom;

wlr_xdg_surface_get_geometry(xdg_shell_view->xdg_toplevel->base, &geom);
*width_out = geom.width;
*height_out = geom.height;
wlr_xdg_surface_get_geometry(xdg_shell_view->xdg_toplevel->base, view_box);
}

static bool
Expand Down
14 changes: 9 additions & 5 deletions xwayland.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,22 @@ get_title(struct cg_view *view)
}

static void
get_geometry(struct cg_view *view, int *width_out, int *height_out)
get_geometry(struct cg_view *view, struct wlr_box *view_box)
{
struct cg_xwayland_view *xwayland_view = xwayland_view_from_view(view);
struct wlr_xwayland_surface *xsurface = xwayland_view->xwayland_surface;

view_box->x = 0;
view_box->y = 0;

if (xsurface->surface == NULL) {
*width_out = 0;
*height_out = 0;
view_box->width = 0;
view_box->height = 0;
return;
}

*width_out = xsurface->surface->current.width;
*height_out = xsurface->surface->current.height;
view_box->width = xsurface->surface->current.width;
view_box->height = xsurface->surface->current.height;
}

static bool
Expand Down
Loading