summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-03-29 09:39:34 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-03-29 09:51:28 +0900
commitc2344223578864624036e44b07e8a29689a23aa0 (patch)
tree9749ea8edb3616a6c064bcf5997741fdcd583cc5
parentd8dd685966858dcc393302374d9c9ae77267e831 (diff)
win: Mark unstable APIs as @beta (stack API)
We have a tag for unstable API, use it. It'll be visible in the doc and force users to add the macro before being able to compile code. This amends d8dd685966858dcc393302.
-rw-r--r--src/bin/elementary/test_win_stack.c9
-rw-r--r--src/lib/elementary/efl_ui_win.c1
-rw-r--r--src/lib/elementary/efl_ui_win.eo24
3 files changed, 15 insertions, 19 deletions
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index 128a805216..23df1bf16b 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -1,6 +1,9 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4
5// Stack API is still beta (and EO only)
6#define EFL_UI_WIN_BETA
4#include <Elementary.h> 7#include <Elementary.h>
5 8
6static int level = 0; 9static int level = 0;
@@ -72,7 +75,7 @@ _win_new(Evas_Object *stack_top, const char *title)
72static void 75static void
73_bt_popto(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 76_bt_popto(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
74{ 77{
75 elm_win_stack_pop_to(popto_win); 78 efl_ui_win_stack_pop_to(popto_win);
76} 79}
77 80
78static void 81static void
@@ -84,7 +87,7 @@ _bt_pressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
84 level++; 87 level++;
85 snprintf(buf, sizeof(buf), "Level %i", level); 88 snprintf(buf, sizeof(buf), "Level %i", level);
86 win = _win_new(data, buf); 89 win = _win_new(data, buf);
87 elm_win_stack_master_id_set(win, elm_win_stack_id_get(data)); 90 efl_ui_win_stack_master_id_set(win, efl_ui_win_stack_id_get(data));
88 evas_object_show(win); 91 evas_object_show(win);
89} 92}
90 93
@@ -94,7 +97,7 @@ test_win_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
94 Evas_Object *bg, *bx, *bt, *lb, *win; 97 Evas_Object *bg, *bx, *bt, *lb, *win;
95 98
96 win = elm_win_add(NULL, "window-stack", ELM_WIN_BASIC); 99 win = elm_win_add(NULL, "window-stack", ELM_WIN_BASIC);
97 elm_win_stack_base_set(win, EINA_TRUE); 100 efl_ui_win_stack_base_set(win, EINA_TRUE);
98 elm_win_title_set(win, "Window Stack"); 101 elm_win_title_set(win, "Window Stack");
99 elm_win_autodel_set(win, EINA_TRUE); 102 elm_win_autodel_set(win, EINA_TRUE);
100 103
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 647de136fb..9e326a2951 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6,6 +6,7 @@
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define EFL_INPUT_EVENT_PROTECTED 7#define EFL_INPUT_EVENT_PROTECTED
8#define EFL_GFX_SIZE_HINT_PROTECTED 8#define EFL_GFX_SIZE_HINT_PROTECTED
9#define EFL_UI_WIN_BETA
9 10
10#include <Elementary.h> 11#include <Elementary.h>
11#include <Elementary_Cursor.h> 12#include <Elementary_Cursor.h>
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index d1ece4ba8e..8e63c08710 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -733,7 +733,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
733 $false otherwise.]] 733 $false otherwise.]]
734 } 734 }
735 } 735 }
736 @property stack_id { 736 @property stack_id @beta {
737 get { 737 get {
738 [[Get the stack ID string of the window as an opaque string. 738 [[Get the stack ID string of the window as an opaque string.
739 739
@@ -746,9 +746,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
746 use by other windows to make this window part of a stack 746 use by other windows to make this window part of a stack
747 of windows to be placed on top of eachother as if they are 747 of windows to be placed on top of eachother as if they are
748 a series of dialogs or questions one after the other and 748 a series of dialogs or questions one after the other and
749 that you may go back through history. 749 that you may go back through history.]]
750
751 WARNING: This API is not stable - do not use yet]]
752 } 750 }
753 values { 751 values {
754 id: string; [[An opaque string that has no specific format, 752 id: string; [[An opaque string that has no specific format,
@@ -756,16 +754,14 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
756 display.]] 754 display.]]
757 } 755 }
758 } 756 }
759 @property stack_master_id { 757 @property stack_master_id @beta {
760 set { 758 set {
761 [[Set the window stack ID to use as the master top-level. 759 [[Set the window stack ID to use as the master top-level.
762 760
763 This sets the ID string to be used as the master top-level 761 This sets the ID string to be used as the master top-level
764 window as the base of a stack of windows. This must be set 762 window as the base of a stack of windows. This must be set
765 before the first time the window is shown and should never 763 before the first time the window is shown and should never
766 be changed after that point in time ever again. 764 be changed after that point in time ever again.]]
767
768 WARNING: This API is not stable - do not use yet]]
769 } 765 }
770 get { 766 get {
771 [[Get the stack master Id that has been set.]] 767 [[Get the stack master Id that has been set.]]
@@ -776,7 +772,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
776 display.]] 772 display.]]
777 } 773 }
778 } 774 }
779 @property stack_base { 775 @property stack_base @beta {
780 [[The stack base state of this window 776 [[The stack base state of this window
781 777
782 This is a boolean flag that determines if this window will 778 This is a boolean flag that determines if this window will
@@ -785,9 +781,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
785 correctly. 781 correctly.
786 782
787 This state should be set before a window is shown for the 783 This state should be set before a window is shown for the
788 first time and never changed again after that. 784 first time and never changed again after that.]]
789
790 WARNING: This API is not stable - do not use yet]]
791 785
792 set {} 786 set {}
793 get {} 787 get {}
@@ -796,13 +790,11 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
796 otherwise.]] 790 otherwise.]]
797 } 791 }
798 } 792 }
799 stack_pop_to { 793 stack_pop_to @beta {
800 [[Pop (delete) all windows in the stack above this window. 794 [[Pop (delete) all windows in the stack above this window.
801 795
802 This will try and delete all the windows in the stack that 796 This will try and delete all the windows in the stack that
803 are above the window. 797 are above the window.]]
804
805 WARNING: This API is not stable - do not use yet]]
806 } 798 }
807 socket_listen { 799 socket_listen {
808 [[Create a socket to provide the service for Plug widget.]] 800 [[Create a socket to provide the service for Plug widget.]]