diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2018-02-08 14:37:35 -0600 |
---|---|---|
committer | Derek Foreman <derekf@osg.samsung.com> | 2018-04-20 13:00:27 -0500 |
commit | 3d2f5b1fd8456598ae5b6eab9ceb89a8388b2b88 (patch) | |
tree | 5bd1caaa5e0797e07e3adbf83f62ad3c83f7f44d /src/lib/elementary/efl_ui_win.c | |
parent | 541ab76e45f30e6849b14742ac87feb5479064f6 (diff) |
efl_ui_win: stop updating wdata->content
We don't need this because we calculate it in ecore_evas from the shadow
value and framespace.
Diffstat (limited to '')
-rw-r--r-- | src/lib/elementary/efl_ui_win.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 9fbad2360c..26328f1de6 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c | |||
@@ -1449,7 +1449,6 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) | |||
1449 | #ifdef HAVE_ELEMENTARY_WL2 | 1449 | #ifdef HAVE_ELEMENTARY_WL2 |
1450 | int ox, oy, ow, oh; | 1450 | int ox, oy, ow, oh; |
1451 | Eina_Bool alpha; | 1451 | Eina_Bool alpha; |
1452 | Ecore_Evas_Engine_Wl_Data *wdata; | ||
1453 | const char *engine_name; | 1452 | const char *engine_name; |
1454 | 1453 | ||
1455 | if (!sd->wl.win) return; | 1454 | if (!sd->wl.win) return; |
@@ -1461,7 +1460,6 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) | |||
1461 | engine_name = ecore_evas_engine_name_get(sd->ee); | 1460 | engine_name = ecore_evas_engine_name_get(sd->ee); |
1462 | if (strncmp(engine_name, "wayland", sizeof("wayland") - 1)) return; | 1461 | if (strncmp(engine_name, "wayland", sizeof("wayland") - 1)) return; |
1463 | 1462 | ||
1464 | wdata = sd->ee->engine.data; | ||
1465 | alpha = ecore_evas_alpha_get(sd->ee) || force_alpha; | 1463 | alpha = ecore_evas_alpha_get(sd->ee) || force_alpha; |
1466 | if (sd->fullscreen || !sd->frame_obj) | 1464 | if (sd->fullscreen || !sd->frame_obj) |
1467 | { | 1465 | { |
@@ -1470,9 +1468,6 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) | |||
1470 | ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, ow, oh); | 1468 | ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, ow, oh); |
1471 | else | 1469 | else |
1472 | ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, 0, 0); | 1470 | ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, 0, 0); |
1473 | wdata->content.x = wdata->content.y = 0; | ||
1474 | wdata->content.w = ow; | ||
1475 | wdata->content.h = oh; | ||
1476 | ecore_wl2_window_geometry_set(sd->wl.win, 0, 0, ow, oh); | 1471 | ecore_wl2_window_geometry_set(sd->wl.win, 0, 0, ow, oh); |
1477 | ecore_wl2_window_input_region_set(sd->wl.win, 0, 0, ow, oh); | 1472 | ecore_wl2_window_input_region_set(sd->wl.win, 0, 0, ow, oh); |
1478 | return; | 1473 | return; |
@@ -1480,9 +1475,6 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) | |||
1480 | 1475 | ||
1481 | edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", | 1476 | edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", |
1482 | &ox, &oy, &ow, &oh); | 1477 | &ox, &oy, &ow, &oh); |
1483 | edje_object_part_geometry_get(sd->frame_obj, "elm.swallow.client", | ||
1484 | &wdata->content.x, &wdata->content.y, | ||
1485 | &wdata->content.w, &wdata->content.h); | ||
1486 | if (!alpha) | 1478 | if (!alpha) |
1487 | ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); | 1479 | ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); |
1488 | else | 1480 | else |