summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2016-07-27 08:08:00 -0400
committerChris Michael <cp.michael@samsung.com>2016-07-27 08:08:00 -0400
commitbf414d8c542db32cb85d41dcbc88f97b38319474 (patch)
tree30e02a0b2861017ecf46a828890ad9f50d91785b
parentccac110d712c8f035f79dcf8818a298f20a44494 (diff)
elementary: Avoid possibly setting opaque region twice
Previously, if the window had no frame object, then this could would have been setting opaque region twice (for the alpha case). We can avoid this if we move the alpha check to below the frame check. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index e6248b3..3021c97 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1303,8 +1303,6 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd)
1303 1303
1304 wdata = sd->ee->engine.data; 1304 wdata = sd->ee->engine.data;
1305 alpha = ecore_evas_alpha_get(sd->ee); 1305 alpha = ecore_evas_alpha_get(sd->ee);
1306 if (alpha)
1307 ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, 0, 0);
1308 if (sd->fullscreen || (!sd->frame_obj)) 1306 if (sd->fullscreen || (!sd->frame_obj))
1309 { 1307 {
1310 ecore_evas_geometry_get(sd->ee, NULL, NULL, &ow, &oh); 1308 ecore_evas_geometry_get(sd->ee, NULL, NULL, &ow, &oh);
@@ -1325,6 +1323,9 @@ _elm_win_opaque_update(Efl_Ui_Win_Data *sd)
1325 &wdata->content.w, &wdata->content.h); 1323 &wdata->content.w, &wdata->content.h);
1326 if (!alpha) 1324 if (!alpha)
1327 ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); 1325 ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh);
1326 else
1327 ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, 0, 0);
1328
1328 ecore_wl2_window_geometry_set(sd->wl.win, ox, oy, ow, oh); 1329 ecore_wl2_window_geometry_set(sd->wl.win, ox, oy, ow, oh);
1329 ecore_wl2_window_input_region_set(sd->wl.win, ox, oy, ow, oh); 1330 ecore_wl2_window_input_region_set(sd->wl.win, ox, oy, ow, oh);
1330} 1331}