summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derek.foreman.samsung@gmail.com>2018-11-28 14:19:56 -0600
committerDerek Foreman <derek.foreman.samsung@gmail.com>2018-12-14 10:29:54 -0600
commit56f7097e176a40ebe2cbfc6522c486e4de81de95 (patch)
tree7fb7ed3a34129ab86319e86310dde9e7e4826698 /src
parentf53c7341c367e8c04c57650f182a186869eb7e54 (diff)
ee_wayland: Replace set_config.geometry direct use with getters
I'm going to deal with some ugly geometry problems in the getter func shortly. Signed-off-by: Derek Foreman <derek.foreman.samsung@gmail.com> Reviewed-by: Chris Michael <cp.michael@samsung.com> Differential Revision: https://phab.enlightenment.org/D7432
Diffstat (limited to 'src')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 65a07862c8..8b4b914cf1 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -584,6 +584,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
584 Ecore_Evas_Engine_Wl_Data *wdata; 584 Ecore_Evas_Engine_Wl_Data *wdata;
585 Ecore_Wl2_Event_Window_Configure *ev; 585 Ecore_Wl2_Event_Window_Configure *ev;
586 int nw = 0, nh = 0, fw, fh, pfw, pfh, sw, sh, contentw, contenth; 586 int nw = 0, nh = 0, fw, fh, pfw, pfh, sw, sh, contentw, contenth;
587 int ww, wh;
587 int framew, frameh; 588 int framew, frameh;
588 Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE; 589 Eina_Bool active, prev_max, prev_full, state_change = EINA_FALSE;
589 590
@@ -617,13 +618,15 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
617 nw = ev->w; 618 nw = ev->w;
618 nh = ev->h; 619 nh = ev->h;
619 620
621 ecore_wl2_window_geometry_get(wdata->win, NULL, NULL, &ww, &wh);
622
620 sw = ee->shadow.l + ee->shadow.r; 623 sw = ee->shadow.l + ee->shadow.r;
621 sh = ee->shadow.t + ee->shadow.b; 624 sh = ee->shadow.t + ee->shadow.b;
622 evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh); 625 evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh);
623 contentw = wdata->win->set_config.geometry.w - (framew - sw); 626 contentw = ww - (framew - sw);
624 contenth = wdata->win->set_config.geometry.h - (frameh - sh); 627 contenth = wh - (frameh - sh);
625 pfw = fw = wdata->win->set_config.geometry.w - contentw; 628 pfw = fw = ww - contentw;
626 pfh = fh = wdata->win->set_config.geometry.h - contenth; 629 pfh = fh = wh - contenth;
627 630
628 if ((prev_max != ee->prop.maximized) || 631 if ((prev_max != ee->prop.maximized) ||
629 (prev_full != ee->prop.fullscreen) || 632 (prev_full != ee->prop.fullscreen) ||
@@ -634,10 +637,10 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
634 sw = ee->shadow.l + ee->shadow.r; 637 sw = ee->shadow.l + ee->shadow.r;
635 sh = ee->shadow.t + ee->shadow.b; 638 sh = ee->shadow.t + ee->shadow.b;
636 evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh); 639 evas_output_framespace_get(ee->evas, NULL, NULL, &framew, &frameh);
637 contentw = wdata->win->set_config.geometry.w - (framew - sw); 640 contentw = ww - (framew - sw);
638 contenth = wdata->win->set_config.geometry.h - (frameh - sh); 641 contenth = wh - (frameh - sh);
639 fw = wdata->win->set_config.geometry.w - contentw; 642 fw = ww - contentw;
640 fh = wdata->win->set_config.geometry.h - contenth; 643 fh = wh - contenth;
641 } 644 }
642 if ((!nw) && (!nh)) 645 if ((!nw) && (!nh))
643 { 646 {
@@ -1877,10 +1880,11 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event EINA_
1877 /* Surviving bits of WWW - track interesting state we might want 1880 /* Surviving bits of WWW - track interesting state we might want
1878 * to pass to clients to do client side effects 1881 * to pass to clients to do client side effects
1879 */ 1882 */
1880 einfo->window.x = wdata->win->set_config.geometry.x; 1883 ecore_wl2_window_geometry_get(wdata->win,
1881 einfo->window.y = wdata->win->set_config.geometry.y; 1884 &einfo->window.x,
1882 einfo->window.w = wdata->win->set_config.geometry.w; 1885 &einfo->window.y,
1883 einfo->window.h = wdata->win->set_config.geometry.h; 1886 &einfo->window.w,
1887 &einfo->window.h);
1884 if (einfo->resizing) 1888 if (einfo->resizing)
1885 { 1889 {
1886 einfo->x_rel = 0; 1890 einfo->x_rel = 0;