diff options
author | Chris Michael <cp.michael@samsung.com> | 2015-10-12 10:55:50 -0400 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2015-10-12 10:55:50 -0400 |
commit | 6263fcc716df45761e30cfd9a3b02f3e3b0b160f (patch) | |
tree | 62fdd110503c0d459a821b8114cf9eb4282e722a /src/lib/ecore_wayland/ecore_wl_window.c | |
parent | 653e258eec564f4175bbf1c30bb687d27959ea83 (diff) |
ecore-wl: Don't update window size during ecore_wl_window_resize
function
Summary: As we call ecore_wl_window_update_size from various places
when needed, don't call it inside the resize function. This addresses
an issue where sizes for the Ecore_Wl_Window may be out of sync
@fix
Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_wayland/ecore_wl_window.c')
-rw-r--r-- | src/lib/ecore_wayland/ecore_wl_window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index d934e633e9..6f6d9eee7b 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c | |||
@@ -194,8 +194,6 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w, int h, int location) | |||
194 | 194 | ||
195 | input = win->keyboard_device; | 195 | input = win->keyboard_device; |
196 | 196 | ||
197 | ecore_wl_window_update_size(win, w, h); | ||
198 | |||
199 | if ((!input) && (win->parent)) | 197 | if ((!input) && (win->parent)) |
200 | { | 198 | { |
201 | if (!(input = win->parent->keyboard_device)) | 199 | if (!(input = win->parent->keyboard_device)) |
@@ -594,6 +592,7 @@ ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h) | |||
594 | win->saved.w = w; | 592 | win->saved.w = w; |
595 | win->saved.h = h; | 593 | win->saved.h = h; |
596 | } | 594 | } |
595 | |||
597 | if (win->xdg_surface) | 596 | if (win->xdg_surface) |
598 | xdg_surface_set_window_geometry(win->xdg_surface, | 597 | xdg_surface_set_window_geometry(win->xdg_surface, |
599 | win->allocation.x, win->allocation.y, | 598 | win->allocation.x, win->allocation.y, |
@@ -608,6 +607,7 @@ ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y) | |||
608 | if (!win) return; | 607 | if (!win) return; |
609 | win->allocation.x = x; | 608 | win->allocation.x = x; |
610 | win->allocation.y = y; | 609 | win->allocation.y = y; |
610 | |||
611 | if (win->xdg_surface) | 611 | if (win->xdg_surface) |
612 | xdg_surface_set_window_geometry(win->xdg_surface, | 612 | xdg_surface_set_window_geometry(win->xdg_surface, |
613 | win->allocation.x, win->allocation.y, | 613 | win->allocation.x, win->allocation.y, |
@@ -1087,6 +1087,7 @@ _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, int edges) | |||
1087 | ev->w = w; | 1087 | ev->w = w; |
1088 | ev->h = h; | 1088 | ev->h = h; |
1089 | ev->edges = edges; | 1089 | ev->edges = edges; |
1090 | |||
1090 | ecore_event_add(ECORE_WL_EVENT_WINDOW_CONFIGURE, ev, NULL, NULL); | 1091 | ecore_event_add(ECORE_WL_EVENT_WINDOW_CONFIGURE, ev, NULL, NULL); |
1091 | } | 1092 | } |
1092 | 1093 | ||