AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 16:30:15 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Don't pass non-changing state when calculating popup rects

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=771117
This commit is contained in:
Jonas Ådahl 2016-09-12 15:00:21 +08:00
parent e656a14764
commit 4d2c0a843a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gdk/wayland/gdkwindow-wayland.c
View File

@ -1626,20 +1626,25 @@ get_real_parent_and_translate (GdkWindow *child,
static void
calculate_popup_rect (GdkWindow *window,
GdkRectangle anchor_rect,
GdkGravity rect_anchor,
GdkGravity window_anchor,
int rect_anchor_dx,
int rect_anchor_dy,
GdkRectangle *out_rect)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
GdkRectangle geometry;
GdkRectangle anchor_rect;
int x = 0, y = 0;
gdk_wayland_window_get_window_geometry (window, &geometry);
anchor_rect.x += rect_anchor_dx;
anchor_rect.y += rect_anchor_dy;
anchor_rect = (GdkRectangle) {
.x = (impl->pending_move_to_rect.rect.x +
impl->pending_move_to_rect.rect_anchor_dx),
.y = (impl->pending_move_to_rect.rect.y +
impl->pending_move_to_rect.rect_anchor_dy),
.width = impl->pending_move_to_rect.rect.width,
.height = impl->pending_move_to_rect.rect.height
};
switch (rect_anchor)
{
@ -1808,11 +1813,8 @@ calculate_moved_to_rect_result (GdkWindow *window,
y += impl->transient_for->shadow_top;
calculate_popup_rect (window,
impl->pending_move_to_rect.rect,
impl->pending_move_to_rect.rect_anchor,
impl->pending_move_to_rect.window_anchor,
impl->pending_move_to_rect.rect_anchor_dx,
impl->pending_move_to_rect.rect_anchor_dy,
&best_rect);
gdk_wayland_window_get_window_geometry (window, &geometry);
@ -1837,11 +1839,8 @@ calculate_moved_to_rect_result (GdkWindow *window,
flipped_window_anchor =
flip_anchor_horizontally (impl->pending_move_to_rect.window_anchor),
calculate_popup_rect (window,
impl->pending_move_to_rect.rect,
flipped_rect_anchor,
flipped_window_anchor,
impl->pending_move_to_rect.rect_anchor_dx,
impl->pending_move_to_rect.rect_anchor_dy,
&flipped_x_rect);
if (flipped_x_rect.x == x)
@ -1859,11 +1858,8 @@ calculate_moved_to_rect_result (GdkWindow *window,
flipped_window_anchor =
flip_anchor_vertically (impl->pending_move_to_rect.window_anchor),
calculate_popup_rect (window,
impl->pending_move_to_rect.rect,
flipped_rect_anchor,
flipped_window_anchor,
impl->pending_move_to_rect.rect_anchor_dx,
impl->pending_move_to_rect.rect_anchor_dy,
&flipped_y_rect);
if (flipped_y_rect.y == y)