summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-12 18:02:18 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-01-12 20:21:04 +0900
commit11432d42a717280f2f25cfd52942b0df59b0e35f (patch)
tree52a867c8f37ec685bb3c08b6bff5bbf53971c38e /src
parent4d8b6d54bc31c82afe33ea3f9c64eb872bc1c885 (diff)
elm theme/test - add start of nviframe window style and test it
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_win_stack.c14
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/elm_win_legacy.h37
4 files changed, 44 insertions, 25 deletions
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index c228a8941d..128a805216 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -15,11 +15,17 @@ _win_new(Evas_Object *stack_top, const char *title)
15 Evas_Object *bg, *bx, *bt, *lb, *win; 15 Evas_Object *bg, *bx, *bt, *lb, *win;
16 16
17 if (level >= 3) 17 if (level >= 3)
18 win = elm_win_add(NULL, "window-stack", ELM_WIN_DIALOG_BASIC); 18 win = efl_add(EFL_UI_WIN_CLASS, NULL,
19 efl_ui_win_name_set(efl_added, "window-stack"),
20 efl_ui_win_type_set(efl_added, ELM_WIN_NAVIFRAME_BASIC),
21 efl_text_set(efl_added, title),
22 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
19 else 23 else
20 win = elm_win_add(NULL, "window-stack", ELM_WIN_BASIC); 24 win = efl_add(EFL_UI_WIN_CLASS, NULL,
21 elm_win_title_set(win, title); 25 efl_ui_win_name_set(efl_added, "window-stack"),
22 elm_win_autodel_set(win, EINA_TRUE); 26 efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC),
27 efl_text_set(efl_added, title),
28 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
23 29
24 if (level == 3) popto_win = win; 30 if (level == 3) popto_win = win;
25 31
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 0c14e7bcf7..38a58e1dde 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4165,7 +4165,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *style)
4165 if (v < FRAME_OBJ_THEME_MIN_VERSION) 4165 if (v < FRAME_OBJ_THEME_MIN_VERSION)
4166 { 4166 {
4167 // Theme compatibility 4167 // Theme compatibility
4168 const char *key = "elm/border/base/default"; // FIXME? 4168 const char *key = "elm/border/base/default"; // FIXME?
4169 char *sys_theme; 4169 char *sys_theme;
4170 4170
4171 WRN("Selected theme does not support the required border theme API " 4171 WRN("Selected theme does not support the required border theme API "
@@ -5103,6 +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";
5107
5106 _elm_win_list = eina_list_append(_elm_win_list, obj); 5108 _elm_win_list = eina_list_append(_elm_win_list, obj);
5107 _elm_win_count++; 5109 _elm_win_count++;
5108 5110
@@ -5111,7 +5113,13 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5111 { 5113 {
5112 TRAP(sd, fullscreen_set, 1); 5114 TRAP(sd, fullscreen_set, 1);
5113 } 5115 }
5114 _elm_win_frame_add(sd, "default"); 5116 switch (type)
5117 {
5118 case EFL_UI_WIN_DIALOG_BASIC: style = "dialog"; break;
5119 case EFL_UI_WIN_NAVIFRAME_BASIC: style = "naviframe"; break;
5120 default: break;
5121 }
5122 _elm_win_frame_add(sd, style);
5115 5123
5116 if (_elm_config->focus_highlight_enable) 5124 if (_elm_config->focus_highlight_enable)
5117 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE); 5125 elm_win_focus_highlight_enabled_set(obj, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 3787aceac2..20f835d1b3 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -53,11 +53,15 @@ enum Efl.Ui.Win.Type
53 contents will be rendered to an image buffer and can be 53 contents will be rendered to an image buffer and can be
54 shown other process's plug image object. 54 shown other process's plug image object.
55 ]] 55 ]]
56 fake [[This window was created using a pre-existing canvas. The window 56 fake, [[This window was created using a pre-existing canvas. The window
57 widget can be deleted, but the canvas must be managed externally. 57 widget can be deleted, but the canvas must be managed externally.
58 58
59 @since 1.13 59 @since 1.13
60 ]] 60 ]]
61 naviframe_basic [[Used for naviframe style replacement with a back
62 button instead of a close button.
63 @since 1.19
64 ]]
61} 65}
62 66
63enum Efl.Ui.Win.Keyboard_Mode 67enum Efl.Ui.Win.Keyboard_Mode
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index c98e6674e1..a4c45abe47 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -52,24 +52,25 @@ typedef enum
52 52
53typedef Efl_Ui_Win_Type Elm_Win_Type; 53typedef Efl_Ui_Win_Type Elm_Win_Type;
54 54
55#define ELM_WIN_UNKNOWN EFL_UI_WIN_UNKNOWN 55#define ELM_WIN_UNKNOWN EFL_UI_WIN_UNKNOWN
56#define ELM_WIN_BASIC EFL_UI_WIN_BASIC 56#define ELM_WIN_BASIC EFL_UI_WIN_BASIC
57#define ELM_WIN_DIALOG_BASIC EFL_UI_WIN_DIALOG_BASIC 57#define ELM_WIN_DIALOG_BASIC EFL_UI_WIN_DIALOG_BASIC
58#define ELM_WIN_DESKTOP EFL_UI_WIN_DESKTOP 58#define ELM_WIN_DESKTOP EFL_UI_WIN_DESKTOP
59#define ELM_WIN_DOCK EFL_UI_WIN_DOCK 59#define ELM_WIN_DOCK EFL_UI_WIN_DOCK
60#define ELM_WIN_TOOLBAR EFL_UI_WIN_TOOLBAR 60#define ELM_WIN_TOOLBAR EFL_UI_WIN_TOOLBAR
61#define ELM_WIN_MENU EFL_UI_WIN_MENU 61#define ELM_WIN_MENU EFL_UI_WIN_MENU
62#define ELM_WIN_UTILITY EFL_UI_WIN_UTILITY 62#define ELM_WIN_UTILITY EFL_UI_WIN_UTILITY
63#define ELM_WIN_SPLASH EFL_UI_WIN_SPLASH 63#define ELM_WIN_SPLASH EFL_UI_WIN_SPLASH
64#define ELM_WIN_DROPDOWN_MENU EFL_UI_WIN_DROPDOWN_MENU 64#define ELM_WIN_DROPDOWN_MENU EFL_UI_WIN_DROPDOWN_MENU
65#define ELM_WIN_POPUP_MENU EFL_UI_WIN_POPUP_MENU 65#define ELM_WIN_POPUP_MENU EFL_UI_WIN_POPUP_MENU
66#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP 66#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP
67#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION 67#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION
68#define ELM_WIN_COMBO EFL_UI_WIN_COMBO 68#define ELM_WIN_COMBO EFL_UI_WIN_COMBO
69#define ELM_WIN_DND EFL_UI_WIN_DND 69#define ELM_WIN_DND EFL_UI_WIN_DND
70#define ELM_WIN_INLINED_IMAGE EFL_UI_WIN_INLINED_IMAGE 70#define ELM_WIN_INLINED_IMAGE EFL_UI_WIN_INLINED_IMAGE
71#define ELM_WIN_SOCKET_IMAGE EFL_UI_WIN_SOCKET_IMAGE 71#define ELM_WIN_SOCKET_IMAGE EFL_UI_WIN_SOCKET_IMAGE
72#define ELM_WIN_FAKE EFL_UI_WIN_FAKE 72#define ELM_WIN_FAKE EFL_UI_WIN_FAKE
73#define ELM_WIN_NAVIFRAME_BASIC EFL_UI_WIN_NAVIFRAME_BASIC
73 74
74typedef Efl_Ui_Win_Keyboard_Mode Elm_Win_Keyboard_Mode; 75typedef Efl_Ui_Win_Keyboard_Mode Elm_Win_Keyboard_Mode;
75 76