summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-02-12 15:05:21 -0600
committerDerek Foreman <derekf@osg.samsung.com>2018-04-20 13:00:28 -0500
commit36f015cda164c5d158e5dbc484098f7a40529b37 (patch)
treed8d19f70e22ecb878bba11cb6d87714b837f7963 /src
parentf73bc102016bed816e033dba177377a2688aa3c0 (diff)
efl_ui_win: Remove special wayland opaque_dirty stuff
This isn't necessary anymore as ecore_evas handles it internally now.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_win.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 3fdfae351c..f44467cbc3 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -102,7 +102,6 @@ struct _Efl_Ui_Win_Data
102 { 102 {
103 Ecore_Wl2_Window *win; 103 Ecore_Wl2_Window *win;
104 Ecore_Event_Handler *configure_handler; 104 Ecore_Event_Handler *configure_handler;
105 Eina_Bool opaque_dirty : 1;
106 } wl; 105 } wl;
107#endif 106#endif
108#ifdef HAVE_ELEMENTARY_COCOA 107#ifdef HAVE_ELEMENTARY_COCOA
@@ -1433,16 +1432,6 @@ _elm_win_profile_update(Efl_Ui_Win_Data *sd)
1433 efl_event_callback_legacy_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL); 1432 efl_event_callback_legacy_call(sd->obj, EFL_UI_WIN_EVENT_PROFILE_CHANGED, NULL);
1434} 1433}
1435 1434
1436static inline void
1437_elm_win_opaque_dirty(Efl_Ui_Win_Data *sd)
1438{
1439#ifdef HAVE_ELEMENTARY_WL2
1440 sd->wl.opaque_dirty = 1;
1441#else
1442 (void)sd;
1443#endif
1444}
1445
1446static void 1435static void
1447_elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha) 1436_elm_win_opaque_update(Efl_Ui_Win_Data *sd, Eina_Bool force_alpha)
1448{ 1437{
@@ -1528,7 +1517,6 @@ _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd)
1528 int w, h; 1517 int w, h;
1529 1518
1530 if (!sd->frame_obj) return; 1519 if (!sd->frame_obj) return;
1531 _elm_win_opaque_dirty(sd);
1532 _elm_win_frame_geometry_adjust(sd); 1520 _elm_win_frame_geometry_adjust(sd);
1533 evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh); 1521 evas_object_geometry_get(sd->frame_obj, &ox, &oy, &ow, &oh);
1534 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch); 1522 edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.content", &cx, &cy, &cw, &ch);
@@ -1638,7 +1626,6 @@ _elm_win_state_change(Ecore_Evas *ee)
1638 _elm_win_frame_style_update(sd, 0, 1); 1626 _elm_win_frame_style_update(sd, 0, 1);
1639 if (sd->fullscreen) 1627 if (sd->fullscreen)
1640 { 1628 {
1641 _elm_win_opaque_dirty(sd);
1642 efl_event_callback_legacy_call 1629 efl_event_callback_legacy_call
1643 (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL); 1630 (obj, EFL_UI_WIN_EVENT_FULLSCREEN, NULL);
1644 } 1631 }
@@ -4271,15 +4258,6 @@ _elm_win_wl_configure(void *data, int t EINA_UNUSED, void *event)
4271 return ECORE_CALLBACK_RENEW; 4258 return ECORE_CALLBACK_RENEW;
4272} 4259}
4273 4260
4274static void
4275_elm_win_frame_pre_render(void *data, Evas *e EINA_UNUSED, void *ev EINA_UNUSED)
4276{
4277 Efl_Ui_Win_Data *sd = data;
4278
4279 if (sd->wl.opaque_dirty)
4280 _elm_win_opaque_update(sd, EINA_FALSE);
4281 sd->wl.opaque_dirty = 0;
4282}
4283#endif 4261#endif
4284 4262
4285static inline void 4263static inline void
@@ -5332,10 +5310,6 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5332#ifdef HAVE_ELEMENTARY_X 5310#ifdef HAVE_ELEMENTARY_X
5333 _elm_win_xwin_update(sd); 5311 _elm_win_xwin_update(sd);
5334#endif 5312#endif
5335#ifdef HAVE_ELEMENTARY_WL2
5336 if (eina_streq(engine, ELM_WAYLAND_SHM) || eina_streq(engine, ELM_WAYLAND_EGL))
5337 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, _elm_win_frame_pre_render, sd);
5338#endif
5339 5313
5340 if (type != ELM_WIN_FAKE) 5314 if (type != ELM_WIN_FAKE)
5341 { 5315 {