summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-02-27 10:09:34 -0500
committerChris Michael <cp.michael@samsung.com>2017-02-27 11:33:49 -0500
commit59bf5476eeb4ea4be2f617a401f078d8efe2fece (patch)
treec6046aa411ec60105826847d707dc5b0008182e5 /src/lib/elementary
parent73ff3e07a293f1073be3316467323a5062218c47 (diff)
elementary: Don't set pointer object theme on start
As we are already resetting the pointer object theme when we make a call to set the cursor, don't set it on window creation. This should address the issue of animators getting created on window creation. ref T5209 @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c65
1 files changed, 27 insertions, 38 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 829891307a..85f9ea30f8 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -3075,6 +3075,8 @@ _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor)
3075 &hx, &hy, NULL, NULL); 3075 &hx, &hy, NULL, NULL);
3076 sd->pointer.hot_x = hx; 3076 sd->pointer.hot_x = hx;
3077 sd->pointer.hot_y = hy; 3077 sd->pointer.hot_y = hy;
3078
3079 ecore_evas_resize(sd->pointer.ee, mw, mh);
3078 } 3080 }
3079 3081
3080 if ((sd->wl.win) && (sd->pointer.surf) && (sd->pointer.visible)) 3082 if ((sd->wl.win) && (sd->pointer.surf) && (sd->pointer.visible))
@@ -5100,44 +5102,6 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5100 _elm_win_need_frame_adjust(sd, engine); 5102 _elm_win_need_frame_adjust(sd, engine);
5101 _elm_win_apply_alpha(obj, sd); 5103 _elm_win_apply_alpha(obj, sd);
5102 5104
5103#ifdef HAVE_ELEMENTARY_WL2
5104 if ((type != ELM_WIN_FAKE) && (type != ELM_WIN_INLINED_IMAGE))
5105 {
5106 if ((engine) &&
5107 ((!strcmp(engine, ELM_WAYLAND_SHM) ||
5108 (!strcmp(engine, ELM_WAYLAND_EGL)))))
5109 {
5110 Evas *pevas;
5111 Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;
5112
5113 if (!strcmp(engine, ELM_WAYLAND_SHM))
5114 sd->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0);
5115 else if (!strcmp(engine, ELM_WAYLAND_EGL))
5116 sd->pointer.ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0);
5117
5118 pevas = ecore_evas_get(sd->pointer.ee);
5119
5120 sd->pointer.obj = edje_object_add(pevas);
5121 _elm_theme_object_set(obj, sd->pointer.obj,
5122 "pointer", "base", "default");
5123 edje_object_size_min_calc(sd->pointer.obj, &mw, &mh);
5124 evas_object_move(sd->pointer.obj, 0, 0);
5125 evas_object_resize(sd->pointer.obj, mw, mh);
5126 edje_object_part_geometry_get(sd->pointer.obj,
5127 "elm.swallow.hotspot",
5128 &hx, &hy, NULL, NULL);
5129 sd->pointer.hot_x = hx;
5130 sd->pointer.hot_y = hy;
5131
5132 sd->pointer.win = _elm_ee_wlwin_get(sd->pointer.ee);
5133 ecore_wl2_window_type_set(sd->pointer.win,
5134 ECORE_WL2_WINDOW_TYPE_NONE);
5135
5136 ecore_evas_resize(sd->pointer.ee, mw, mh);
5137 }
5138 }
5139#endif
5140
5141 /* do not append to list; all windows render as black rects */ 5105 /* do not append to list; all windows render as black rects */
5142 if (type != ELM_WIN_FAKE) 5106 if (type != ELM_WIN_FAKE)
5143 { 5107 {
@@ -5168,6 +5132,31 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5168 elm_win_focus_highlight_animate_set(obj, EINA_TRUE); 5132 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5169 } 5133 }
5170 5134
5135#ifdef HAVE_ELEMENTARY_WL2
5136 if ((type != ELM_WIN_FAKE) && (type != ELM_WIN_INLINED_IMAGE))
5137 {
5138 if ((engine) &&
5139 ((!strcmp(engine, ELM_WAYLAND_SHM) ||
5140 (!strcmp(engine, ELM_WAYLAND_EGL)))))
5141 {
5142 Evas *pevas;
5143
5144 if (!strcmp(engine, ELM_WAYLAND_SHM))
5145 sd->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0);
5146 else if (!strcmp(engine, ELM_WAYLAND_EGL))
5147 sd->pointer.ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0);
5148
5149 pevas = ecore_evas_get(sd->pointer.ee);
5150
5151 sd->pointer.obj = edje_object_add(pevas);
5152
5153 sd->pointer.win = ecore_evas_wayland2_window_get(sd->pointer.ee);
5154 ecore_wl2_window_type_set(sd->pointer.win,
5155 ECORE_WL2_WINDOW_TYPE_NONE);
5156 }
5157 }
5158#endif
5159
5171 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW); 5160 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
5172 if (_elm_config->atspi_mode) 5161 if (_elm_config->atspi_mode)
5173 elm_interface_atspi_window_created_signal_emit(obj); 5162 elm_interface_atspi_window_created_signal_emit(obj);