Skip to content
Open
Show file tree
Hide file tree
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
43 changes: 24 additions & 19 deletions src/core/window.c
Original file line number Diff line number Diff line change
Expand Up @@ -1100,25 +1100,30 @@ _meta_window_shared_new (MetaDisplay *display,
/* avoid tons of stack updates */
meta_stack_freeze (window->display->stack);

window->rect.x = attrs->x;
window->rect.y = attrs->y;
window->rect.width = attrs->width;
window->rect.height = attrs->height;

/* size_hints are the "request" */
window->size_hints.x = attrs->x;
window->size_hints.y = attrs->y;
window->size_hints.width = attrs->width;
window->size_hints.height = attrs->height;
/* initialize the remaining size_hints as if size_hints.flags were zero */
meta_set_normal_hints (window, NULL);

/* And this is our unmaximized size */
window->saved_rect = window->rect;
window->unconstrained_rect = window->rect;

window->depth = attrs->depth;
window->xvisual = attrs->visual;
if (attrs->width != 1 &&
attrs->height != 1)
{
window->rect.x = attrs->x;
window->rect.y = attrs->y;
window->rect.width = attrs->width;
window->rect.height = attrs->height;

/* size_hints are the "request" */
window->size_hints.x = attrs->x;
window->size_hints.y = attrs->y;
window->size_hints.width = attrs->width;
window->size_hints.height = attrs->height;

/* initialize the remaining size_hints as if size_hints.flags were zero */
meta_set_normal_hints (window, NULL);

/* And this is our unmaximized size */
window->saved_rect = window->rect;
window->unconstrained_rect = window->rect;

window->depth = attrs->depth;
window->xvisual = attrs->visual;
}

window->title = NULL;
window->icon = NULL;
Expand Down
12 changes: 8 additions & 4 deletions src/x11/window-x11.c
Original file line number Diff line number Diff line change
Expand Up @@ -3817,10 +3817,14 @@ meta_window_x11_configure_notify (MetaWindow *window,
g_assert (window->override_redirect);
g_assert (window->frame == NULL);

window->rect.x = event->x;
window->rect.y = event->y;
window->rect.width = event->width;
window->rect.height = event->height;
if (event->width != 1 &&
event->height != 1)
{
window->rect.x = event->x;
window->rect.y = event->y;
window->rect.width = event->width;
window->rect.height = event->height;
}

priv->client_rect = window->rect;
window->buffer_rect = window->rect;
Expand Down
Loading