summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi-Youn Park <jy0703.park@samsung.com>2016-05-19 17:19:40 +0830
committerJi-Youn Park <jy0703.park@samsung.com>2016-05-19 17:19:40 +0830
commit3046b8ac4c30c8a6fc27337005056b4e5c678b08 (patch)
tree2c3b8aa538e68e0c4c9ecdae41de8bb263f194f2
parent2009ae225d919f14c1c2f78d3ea5184420894000 (diff)
elm_win: add elm_win_indcator_overlap mode into window's eo.
elm_window will be changed to control layout related with conformant. one of features is overlap between indicator and layout.
-rw-r--r--src/lib/elementary/elm_win.c14
-rw-r--r--src/lib/elementary/elm_win.eo74
2 files changed, 64 insertions, 24 deletions
diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c
index 4fa67c9be0..9a49dc154b 100644
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/elm_win.c
@@ -5173,6 +5173,20 @@ _elm_win_indicator_opacity_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
5173} 5173}
5174 5174
5175EOLIAN static void 5175EOLIAN static void
5176_elm_win_indicator_overlap_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED, Elm_Win_Indicator_Overlap_Mode mode EINA_UNUSED)
5177{
5178 //TODO: this mode will be implemented after removing the conformant.
5179 return;
5180}
5181
5182EOLIAN static Elm_Win_Indicator_Overlap_Mode
5183_elm_win_indicator_overlap_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED)
5184{
5185 //TODO: this mode will be implemented after removing the conformant.
5186 return ELM_WIN_INDICATOR_OVERLAP_UNKNOWN;
5187}
5188
5189EOLIAN static void
5176_elm_win_screen_position_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *x, int *y) 5190_elm_win_screen_position_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int *x, int *y)
5177{ 5191{
5178 if (x) *x = sd->screen.x; 5192 if (x) *x = sd->screen.x;
diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index 428cac41da..469d9dfbcb 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -104,8 +104,9 @@ enum Elm.Win.Indicator_Mode
104 104
105 Sometimes you don't want it because you provide the same functionality 105 Sometimes you don't want it because you provide the same functionality
106 inside your app, so this will request that the indicator is hidden in 106 inside your app, so this will request that the indicator is hidden in
107 this circumstance if you use ELM_ILLUME_INDICATOR_HIDE. The default 107 this circumstance. The default is depend on the environments.
108 is to have the indicator shown. 108 For example, like phones, default is to have the indicator shown.
109 But like TV, default is to have the indicator hidden.
109 ]] 110 ]]
110 111
111 legacy: elm_win_indicator; 112 legacy: elm_win_indicator;
@@ -126,6 +127,20 @@ enum Elm.Win.Indicator_Opacity_Mode
126 transparent [[Transparentizes the indicator]] 127 transparent [[Transparentizes the indicator]]
127} 128}
128 129
130enum Elm.Win.Indicator_Overlap_Mode
131{
132 [[Defines the overlap modes of indicator that can be shown.
133 Using this mode, user can determine whether the content of window
134 overlaps with indicator or not.]]
135 legacy: elm_win_indicator;
136
137 overlap_unknown, [[Unknown indicator overlap mode]]
138 overlap, [[Indicator can be overlapped with the content of window.
139 Content can be placed under the indicator in z-order.]]
140 nooverlap, [[Indicator can not be overlapped with the content of window.
141 The Y coordinate of content is same as (Y coordinate of indicator + indicator height)]]
142}
143
129/** 144/**
130 */ 145 */
131enum Elm.Win.Keygrab_Mode 146enum Elm.Win.Keygrab_Mode
@@ -168,6 +183,39 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
168 eo_prefix: elm_obj_win; 183 eo_prefix: elm_obj_win;
169 event_prefix: elm_win; 184 event_prefix: elm_win;
170 methods { 185 methods {
186 @property indicator_mode {
187 set {
188 [[Sets the indicator mode of the window.]]
189 }
190 get {
191 [[Get the indicator mode of the window.]]
192 }
193 values {
194 mode: Elm.Win.Indicator_Mode; [[The mode, one of #Elm_Win_Indicator_Mode.]]
195 }
196 }
197 @property indicator_opacity {
198 set {
199 [[Sets the indicator opacity mode of the window.]]
200 }
201 get {
202 [[Get the indicator opacity mode of the window.]]
203 }
204 values {
205 mode: Elm.Win.Indicator_Opacity_Mode; [[The mode, one of #Elm_Win_Indicator_Opacity_Mode.]]
206 }
207 }
208 @property indicator_overlap {
209 set {
210 [[Sets the indicator overlap mode of the window.]]
211 }
212 get {
213 [[Get the indicator overlap mode of the window.]]
214 }
215 values {
216 mode: Elm.Win.Indicator_Overlap_Mode; [[The mode, one of #Elm_Win_Indicator_Overlap_Mode.]]
217 }
218 }
171 @property keyboard_win { 219 @property keyboard_win {
172 set { 220 set {
173 [[Sets whether the window is a keyboard.]] 221 [[Sets whether the window is a keyboard.]]
@@ -614,17 +662,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
614 otherwise it is width divided by height.]] 662 otherwise it is width divided by height.]]
615 } 663 }
616 } 664 }
617 @property indicator_opacity {
618 set {
619 [[Sets the indicator opacity mode of the window.]]
620 }
621 get {
622 [[Get the indicator opacity mode of the window.]]
623 }
624 values {
625 mode: Elm.Win.Indicator_Opacity_Mode; [[The mode, one of #Elm_Win_Indicator_Opacity_Mode.]]
626 }
627 }
628 @property demand_attention { 665 @property demand_attention {
629 set { 666 set {
630 [[Set the demand_attention state of a window.]] 667 [[Set the demand_attention state of a window.]]
@@ -758,17 +795,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
758 set: bool; [[$true to set manual rotation done mode, $false otherwise.]] 795 set: bool; [[$true to set manual rotation done mode, $false otherwise.]]
759 } 796 }
760 } 797 }
761 @property indicator_mode {
762 set {
763 [[Sets the indicator mode of the window.]]
764 }
765 get {
766 [[Get the indicator mode of the window.]]
767 }
768 values {
769 mode: Elm.Win.Indicator_Mode; [[The mode, one of #Elm_Win_Indicator_Mode.]]
770 }
771 }
772 @property conformant { 798 @property conformant {
773 set { 799 set {
774 [[Set if this window is an illume conformant window.]] 800 [[Set if this window is an illume conformant window.]]