summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-13 18:04:17 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-13 18:04:17 +0900
commit4fe9144c9dac0df02cfcd5b2d11f2a9438285056 (patch)
treeed7ae4156408282c52c6a7526a825e7887cd035e /src
parent14a98506d5def91fec032d202019d8e0e305624f (diff)
efl_ui_win - switch to the element being used for border type
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_win.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 38a58e1dde..e76c73b086 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -340,7 +340,7 @@ _elm_win_on_resize_obj_changed_size_hints(void *data,
340static void 340static void
341_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); 341_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
342static Elm_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); 342static Elm_Theme_Apply _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
343static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style); 343static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style);
344static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); 344static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc);
345static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); 345static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine);
346static void _elm_win_resize_objects_eval(Evas_Object *obj); 346static void _elm_win_resize_objects_eval(Evas_Object *obj);
@@ -4134,7 +4134,7 @@ _efl_system_theme_path_get(void)
4134} 4134}
4135 4135
4136static void 4136static void
4137_elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style) 4137_elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4138{ 4138{
4139 Evas_Object *obj = sd->obj; 4139 Evas_Object *obj = sd->obj;
4140 int w, h, mw, mh, v; 4140 int w, h, mw, mh, v;
@@ -4150,7 +4150,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
4150 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION)) 4150 if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION))
4151 { 4151 {
4152 if (!elm_widget_theme_object_set 4152 if (!elm_widget_theme_object_set
4153 (sd->obj, sd->frame_obj, "border", "base", style)) 4153 (sd->obj, sd->frame_obj, "border", element, style))
4154 { 4154 {
4155 ERR("Failed to set main border theme for the window."); 4155 ERR("Failed to set main border theme for the window.");
4156 ELM_SAFE_FREE(sd->frame_obj, evas_object_del); 4156 ELM_SAFE_FREE(sd->frame_obj, evas_object_del);
@@ -5103,7 +5103,8 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5103 /* do not append to list; all windows render as black rects */ 5103 /* do not append to list; all windows render as black rects */
5104 if (type != ELM_WIN_FAKE) 5104 if (type != ELM_WIN_FAKE)
5105 { 5105 {
5106 const char *style = "default"; 5106 const char *element = "base";
5107 const char *style;
5107 5108
5108 _elm_win_list = eina_list_append(_elm_win_list, obj); 5109 _elm_win_list = eina_list_append(_elm_win_list, obj);
5109 _elm_win_count++; 5110 _elm_win_count++;
@@ -5113,13 +5114,15 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5113 { 5114 {
5114 TRAP(sd, fullscreen_set, 1); 5115 TRAP(sd, fullscreen_set, 1);
5115 } 5116 }
5117 style = elm_widget_style_get(obj);
5118 if (!style) style = "default";
5116 switch (type) 5119 switch (type)
5117 { 5120 {
5118 case EFL_UI_WIN_DIALOG_BASIC: style = "dialog"; break; 5121 case EFL_UI_WIN_DIALOG_BASIC: element = "dialog"; break;
5119 case EFL_UI_WIN_NAVIFRAME_BASIC: style = "naviframe"; break; 5122 case EFL_UI_WIN_NAVIFRAME_BASIC: element = "naviframe"; break;
5120 default: break; 5123 default: break;
5121 } 5124 }
5122 _elm_win_frame_add(sd, style); 5125 _elm_win_frame_add(sd, element, style);
5123 5126
5124 if (_elm_config->focus_highlight_enable) 5127 if (_elm_config->focus_highlight_enable)
5125 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE); 5128 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);