summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 16:24:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 20:53:15 +0900
commit53c966b79044bb4b78c058072b3baa63cfb62f68 (patch)
tree54b036c9ff98f56982842062e468bbdf8a536717
parentec264c500248f9026c398571e9dc7f3eea671685 (diff)
widget: Rename top to widget_top (EO)
Ref T5363
-rw-r--r--src/lib/elementary/elm_widget.c8
-rw-r--r--src/lib/elementary/elm_widget.eo64
2 files changed, 45 insertions, 27 deletions
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index eb3fc6dc73..29ec6946c9 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1913,16 +1913,14 @@ _elm_widget_focused_object_get(Eo *obj, Elm_Widget_Smart_Data *sd)
1913} 1913}
1914 1914
1915EOLIAN static Evas_Object* 1915EOLIAN static Evas_Object*
1916_elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) 1916_elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
1917{ 1917{
1918 if (sd->parent_obj) 1918 if (sd->parent_obj)
1919 { 1919 {
1920 Evas_Object *ret = NULL;
1921 if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL; 1920 if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
1922 ret = elm_obj_widget_top_get((Eo *) sd->parent_obj); 1921 return elm_obj_widget_top_get(sd->parent_obj);
1923 return ret;
1924 } 1922 }
1925 return (Evas_Object *)obj; 1923 return obj;
1926} 1924}
1927 1925
1928EAPI Eina_Bool 1926EAPI Eina_Bool
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 02e0f9e6ed..ab56301dbc 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -177,6 +177,48 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
177 can_focus: bool; [[Whether the object is focusable.]] 177 can_focus: bool; [[Whether the object is focusable.]]
178 } 178 }
179 } 179 }
180 @property widget_parent @protected {
181 [[The internal parent of this widget.
182
183 @Elm.Widget objects have a parent hierarchy that may differ slightly
184 from their @Efl.Object or @Efl.Canvas.Object hierarchy. This is
185 meant for internal handling.
186
187 See also @.widget_top.
188 ]]
189 set {}
190 get {
191 legacy: elm_widget_parent_get; /* internal in legacy */
192 }
193 values {
194 parent: Elm.Widget @nullable; [[Widget parent object]]
195 }
196 }
197 @property widget_top {
198 [[Root widget in the widget hierarchy.
199
200 This returns the top widget, in terms of widget hierarchy. This is
201 usually a window ($Efl.Ui.Win). This function walks the list of
202 @.widget_parent.
203
204 If this widget has no parent (in terms of widget hierarchy) this
205 will return $null.
206
207 Note: This may not be a display manager window in case of nested
208 canvases. If a "real" window is required, then you might want to
209 verify that the returned object is a $Efl.Ui.Win_Inlined, and then
210 get $Efl.Ui.Win_Inlined.inlined_parent to find an object in the
211 master window.
212
213 See also @.widget_parent.
214 ]]
215 get {
216 legacy: elm_widget_top_get; /* internal in legacy */
217 }
218 values {
219 top: Elm.Widget; [[Top widget, usually a window.]]
220 }
221 }
180 222
181 /* Not sure if the following are internal only? */ 223 /* Not sure if the following are internal only? */
182 @property on_show_region_hook { 224 @property on_show_region_hook {
@@ -252,16 +294,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
252 highlight: bool; [[$true if widget gets hightlight, $false otherwise]] 294 highlight: bool; [[$true if widget gets hightlight, $false otherwise]]
253 } 295 }
254 } 296 }
255 @property widget_parent @protected {
256 [[The internal widget parent]]
257 set {}
258 get {
259 legacy: elm_widget_parent_get; /* Needed because we don't do duplication removal for legacy names. */
260 }
261 values {
262 parent: Efl.Canvas.Object @nullable; [[Widget parent object]]
263 }
264 }
265 @property access_info { 297 @property access_info {
266 [[Accessibility information]] 298 [[Accessibility information]]
267 values { 299 values {
@@ -385,12 +417,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
385 h: int; [[Height]] 417 h: int; [[Height]]
386 } 418 }
387 } 419 }
388 @property top {
389 [[Top widget property]]
390 get {
391 return: Efl.Canvas.Object; [[Top widget]]
392 }
393 }
394 @property focus_order { 420 @property focus_order {
395 [[Focus order property]] 421 [[Focus order property]]
396 get { 422 get {
@@ -732,12 +758,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
732 @in sobj: Efl.Canvas.Object; [[Object to be deleted]] 758 @in sobj: Efl.Canvas.Object; [[Object to be deleted]]
733 } 759 }
734 } 760 }
735 tooltip_add {
736 [[Add tooltip to widget]]
737 params {
738 @in tt: ptr(Elm.Tooltip); [[Tooltip]]
739 }
740 }
741 focus_region_show @const { 761 focus_region_show @const {
742 [[Show focus region]] 762 [[Show focus region]]
743 } 763 }