enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elm_win: remove elm_win_keyboard_win_set/get from eo. 

this api is not used by wayland side.
and this kind of API can be implemented name set or class set api.
This commit is contained in:
Ji-Youn Park 2016-05-26 15:32:58 +08:30
parent a1a2bc5017
commit e3de1ab9f7
3 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/lib/elementary/elm_win.c
View File

@ -5090,31 +5090,6 @@ _elm_win_keyboard_mode_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
return sd->kbdmode;
}
EOLIAN static void
_elm_win_keyboard_win_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool is_keyboard)
{
#ifdef HAVE_ELEMENTARY_X
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin)
ecore_x_e_virtual_keyboard_set(sd->x.xwin, is_keyboard);
#else
(void)sd;
(void)is_keyboard;
#endif
}
EOLIAN static Eina_Bool
_elm_win_keyboard_win_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
{
#ifdef HAVE_ELEMENTARY_X
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin) return ecore_x_e_virtual_keyboard_get(sd->x.xwin);
#else
(void)sd;
#endif
return EINA_FALSE;
}
EOLIAN static void
_elm_win_indicator_enabled_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd EINA_UNUSED, Eina_Bool enable EINA_UNUSED)
{
@ -6041,6 +6016,37 @@ elm_win_indicator_opacity_get(const Evas_Object *obj)
return sd->ind_o_mode;
}
EAPI void
elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard)
{
ELM_WIN_CHECK(obj);
ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
#ifdef HAVE_ELEMENTARY_X
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin)
ecore_x_e_virtual_keyboard_set(sd->x.xwin, is_keyboard);
#else
(void)sd;
(void)is_keyboard;
#endif
}
EAPI Eina_Bool
elm_win_keyboard_win_get(const Evas_Object *obj)
{
ELM_WIN_CHECK(obj) EINA_FALSE;
ELM_WIN_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE);
#ifdef HAVE_ELEMENTARY_X
_internal_elm_win_xwindow_get(sd);
if (sd->x.xwin) return ecore_x_e_virtual_keyboard_get(sd->x.xwin);
#else
(void)sd;
#endif
return EINA_FALSE;
}
#ifndef EFL_TEAMWORK_VERSION
# define EFL_TEAMWORK_VERSION 2
#endif

19
src/lib/elementary/elm_win.eo
View File

@ -187,15 +187,15 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
type: Elm.Win.Indicator_Type; [[The type, one of #Elm_Win_Indicator_Type.]]
}
}
@property keyboard_win {
@property keyboard_mode {
set {
[[Sets whether the window is a keyboard.]]
[[Sets the keyboard mode of the window.]]
}
get {
[[Get whether the window is a keyboard.]]
[[Get the keyboard mode of the window.]]
}
values {
is_keyboard: bool; [[If true, the window is a virtual keyboard.]]
mode: Elm.Win.Keyboard_Mode; [[The mode, one of #Elm_Win_Keyboard_Mode.]]
}
}
@property autodel {
@ -594,17 +594,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
sticky: bool; [[If true, the window's sticky state is enabled.]]
}
}
@property keyboard_mode {
set {
[[Sets the keyboard mode of the window.]]
}
get {
[[Get the keyboard mode of the window.]]
}
values {
mode: Elm.Win.Keyboard_Mode; [[The mode, one of #Elm_Win_Keyboard_Mode.]]
}
}
@property focus_highlight_animate {
set {
[[Set the animate status for the focus highlight for this window.

19
src/lib/elementary/elm_win_legacy.h
View File

@ -530,3 +530,22 @@ EAPI void elm_win_indicator_opacity_set(Evas_Object *obj, Elm_Win_Indicator_Opac
*/
EAPI Elm_Win_Indicator_Opacity_Mode elm_win_indicator_opacity_get(const Evas_Object *obj);
/**
* @brief Sets whether the window is a keyboard.
*
* @param[in] mode If true, the window is a virtual keyboard..
*
* @ingroup Elm_Win
*/
EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool is_keyboard);
/**
* @brief Get whether the window is a keyboard
*
* @return The mode, If true, the window is a virtual keyboard..
*
* @ingroup Elm_Win
*/
EAPI Eina_Bool elm_win_keyboard_win_get(const Evas_Object *obj);