jypark pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1ee72bbf04eb2297f47e888c66b107d9ad27d013
commit 1ee72bbf04eb2297f47e888c66b107d9ad27d013
Author: Ji-Youn Park <jy0703.p...@samsung.com>
Date: Wed May 4 15:49:32 2016 +0830
elm_win: move elm_win_raise into eo again.
elm_win_raise is used not only x but also wayland.
so I modify doc and move again this api to eo.
---
src/lib/elementary/elm_win.c | 15 ++++++---------
src/lib/elementary/elm_win.eo | 7 +++++++
src/lib/elementary/elm_win_legacy.h | 13 -------------
3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c
index c7c6694..c0f0a25 100644
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/elm_win.c
@@ -4360,6 +4360,12 @@ _elm_win_activate(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
}
EOLIAN static void
+_elm_win_raise(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
+{
+ TRAP(sd, raise);
+}
+
+EOLIAN static void
_elm_win_center(Eo *obj, Elm_Win_Data *sd, Eina_Bool h, Eina_Bool v)
{
int win_w, win_h, screen_w, screen_h, nx, ny;
@@ -5938,13 +5944,4 @@ elm_win_lower(Evas_Object *obj)
TRAP(sd, lower);
}
-EAPI void
-elm_win_raise(Evas_Object *obj)
-{
- ELM_WIN_CHECK(obj);
- ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
-
- TRAP(sd, raise);
-}
-
#include "elm_win.eo.c"
diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo
index 69f81d2..60bf3f9 100644
--- a/src/lib/elementary/elm_win.eo
+++ b/src/lib/elementary/elm_win.eo
@@ -1105,6 +1105,13 @@ class Elm.Win (Elm.Widget, Elm.Interface_Atspi_Window,
window will be the active one after it.
]]
}
+ raise {
+ [[Raise a window object.
+
+ Places the window pointed by $obj at the top of the stack, so
+ that it's not covered by any other window.
+ ]]
+ }
center {
[[Center a window on its screen
diff --git a/src/lib/elementary/elm_win_legacy.h
b/src/lib/elementary/elm_win_legacy.h
index cd06396..7a7e3f6 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -379,19 +379,6 @@ EAPI void elm_win_override_set(Evas_Object *obj, Eina_Bool
override);
EAPI Eina_Bool elm_win_override_get(const Evas_Object *obj);
/**
- * @brief Raise a window object.
- *
- * Places the window pointed by @c obj at the top of the stack, so that it's
- * not covered by any other window.
- *
- * If @ref elm_win_override_set is not set, the Window Manager may ignore this
- * request.
- *
- * @ingroup Elm_Win
- */
-EAPI void elm_win_raise(Evas_Object *obj);
-
-/**
* @brief Lower a window object.
*
* Places the window pointed by @c obj at the bottom of the stack, so that no
--
