summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-01-30 11:03:57 -0500
committerChris Michael <cp.michael@samsung.com>2017-01-30 11:03:57 -0500
commit005ad5eeefcbc26dfaf156bd3a252bf5ec8f8a5a (patch)
treee31ef94c4319da1c210d307b15c8eaafb0b583ad
parentbfd221e6101b6502b4fca04a540eee1e7bc7eb37 (diff)
elementary: Create wayland pointer before frame
If we create the pointer After the frame, then we end up setting elm_object_cursor on the frame object which we do not need so this patch just slightly modifies the order of things during finalize so that _elm_win_frame_add does not end up calling _elm_object_part_cursor_set on the frame object. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 24d8ae23fb..0d0d70605a 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5103,36 +5103,6 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5103 _elm_win_need_frame_adjust(sd, engine); 5103 _elm_win_need_frame_adjust(sd, engine);
5104 _elm_win_apply_alpha(obj, sd); 5104 _elm_win_apply_alpha(obj, sd);
5105 5105
5106 /* do not append to list; all windows render as black rects */
5107 if (type != ELM_WIN_FAKE)
5108 {
5109 const char *element = "base";
5110 const char *style;
5111
5112 _elm_win_list = eina_list_append(_elm_win_list, obj);
5113 _elm_win_count++;
5114
5115 if ((engine) &&
5116 ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))
5117 {
5118 TRAP(sd, fullscreen_set, 1);
5119 }
5120 style = elm_widget_style_get(obj);
5121 if (!style) style = "default";
5122 switch (type)
5123 {
5124 case EFL_UI_WIN_DIALOG_BASIC: element = "dialog"; break;
5125 case EFL_UI_WIN_NAVIFRAME_BASIC: element = "naviframe"; break;
5126 default: break;
5127 }
5128 _elm_win_frame_add(sd, element, style);
5129
5130 if (_elm_config->focus_highlight_enable)
5131 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);
5132 if (_elm_config->focus_highlight_animate)
5133 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5134 }
5135
5136#ifdef HAVE_ELEMENTARY_WL2 5106#ifdef HAVE_ELEMENTARY_WL2
5137 if ((type != ELM_WIN_FAKE) && (type != ELM_WIN_INLINED_IMAGE)) 5107 if ((type != ELM_WIN_FAKE) && (type != ELM_WIN_INLINED_IMAGE))
5138 { 5108 {
@@ -5171,6 +5141,36 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5171 } 5141 }
5172#endif 5142#endif
5173 5143
5144 /* do not append to list; all windows render as black rects */
5145 if (type != ELM_WIN_FAKE)
5146 {
5147 const char *element = "base";
5148 const char *style;
5149
5150 _elm_win_list = eina_list_append(_elm_win_list, obj);
5151 _elm_win_count++;
5152
5153 if ((engine) &&
5154 ((!strcmp(engine, ELM_SOFTWARE_FB)) || (!strcmp(engine, ELM_DRM))))
5155 {
5156 TRAP(sd, fullscreen_set, 1);
5157 }
5158 style = elm_widget_style_get(obj);
5159 if (!style) style = "default";
5160 switch (type)
5161 {
5162 case EFL_UI_WIN_DIALOG_BASIC: element = "dialog"; break;
5163 case EFL_UI_WIN_NAVIFRAME_BASIC: element = "naviframe"; break;
5164 default: break;
5165 }
5166 _elm_win_frame_add(sd, element, style);
5167
5168 if (_elm_config->focus_highlight_enable)
5169 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);
5170 if (_elm_config->focus_highlight_animate)
5171 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5172 }
5173
5174 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW); 5174 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW);
5175 if (_elm_config->atspi_mode) 5175 if (_elm_config->atspi_mode)
5176 elm_interface_atspi_window_created_signal_emit(obj); 5176 elm_interface_atspi_window_created_signal_emit(obj);