summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wayland
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-03-04 16:45:50 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-04 16:45:50 -0500
commit50da07d0268de21025a811c3a30f32bea6769bcb (patch)
treed3a561e15585d908e766532478fec5aa3ff18cc2 /src/lib/ecore_wayland
parent2e319df7b0f72631c2d4d475b3321dc3a7d68ef2 (diff)
ecore-wl update window saved.size on any resize instead of just fs/maximize
Diffstat (limited to 'src/lib/ecore_wayland')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 5216321..40cf0cb 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -474,9 +474,6 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
474 474
475 if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL) 475 if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL)
476 { 476 {
477 win->saved.w = win->allocation.w;
478 win->saved.h = win->allocation.h;
479
480 if (win->xdg_surface) 477 if (win->xdg_surface)
481 { 478 {
482 xdg_surface_set_maximized(win->xdg_surface); 479 xdg_surface_set_maximized(win->xdg_surface);
@@ -528,8 +525,6 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
528 if (fullscreen) 525 if (fullscreen)
529 { 526 {
530 win->type = ECORE_WL_WINDOW_TYPE_FULLSCREEN; 527 win->type = ECORE_WL_WINDOW_TYPE_FULLSCREEN;
531 win->saved.w = win->allocation.w;
532 win->saved.h = win->allocation.h;
533 528
534 if (win->xdg_surface) 529 if (win->xdg_surface)
535 xdg_surface_set_fullscreen(win->xdg_surface, NULL); 530 xdg_surface_set_fullscreen(win->xdg_surface, NULL);
@@ -617,6 +612,11 @@ ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h)
617 if (!win) return; 612 if (!win) return;
618 win->allocation.w = w; 613 win->allocation.w = w;
619 win->allocation.h = h; 614 win->allocation.h = h;
615 if ((!ecore_wl_window_maximized_get(win)) && (!win->fullscreen))
616 {
617 win->saved.w = w;
618 win->saved.h = h;
619 }
620 if (win->xdg_surface) 620 if (win->xdg_surface)
621 xdg_surface_set_window_geometry(win->xdg_surface, 621 xdg_surface_set_window_geometry(win->xdg_surface,
622 win->allocation.x, win->allocation.y, 622 win->allocation.x, win->allocation.y,