elm: EO-ify some elm_config enums

Elm_Focus_Autoscroll_Mode
Elm_Softcursor_Mode
Elm_Slider_Indicator_Visible_Mode (rename only)
Elm_Focus_Move_Policy (rename only)

This is for Efl.Config API.
This commit is contained in:
Jean-Philippe Andre 2016-06-23 16:45:32 +09:00
parent 47a1fae200
commit 575c704b02
4 changed files with 49 additions and 26 deletions

View File

@ -792,19 +792,6 @@ EAPI double elm_config_scroll_thumbscroll_acceleration_weight_get(void);
*/
EAPI void elm_config_scroll_thumbscroll_acceleration_weight_set(double weight);
/**
* Focus Autoscroll Mode
*
* @since 1.10
* @ingroup Elm_Focus
*/
typedef enum
{
ELM_FOCUS_AUTOSCROLL_MODE_SHOW, /**< directly show the focused region or item automatically */
ELM_FOCUS_AUTOSCROLL_MODE_NONE, /**< do not show the focused region or item automatically */
ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN /**< bring_in the focused region or item automatically which might invole the scrolling */
} Elm_Focus_Autoscroll_Mode;
/**
* Get focus auto scroll mode.
*
@ -881,13 +868,6 @@ EAPI double elm_config_longpress_timeout_get(void);
*/
EAPI void elm_config_longpress_timeout_set(double longpress_timeout);
typedef enum _Elm_Softcursor_Mode
{
ELM_SOFTCURSOR_MODE_AUTO, /**< Auto-detect if a software cursor should be used (default) */
ELM_SOFTCURSOR_MODE_ON, /**< Always use a softcursor */
ELM_SOFTCURSOR_MODE_OFF /**< Never use a softcursor */
} Elm_Softcursor_Mode; /**< @since 1.7 */
/**
* Set the mode used for software provided mouse cursors inline in the window
* canvas.

View File

@ -200,7 +200,7 @@ enum Elm.Focus.Region.Show_Mode
item, [[As an item.]]
}
enum Elm.Focus.Move_Policy
enum Efl.Ui.Focus.Move_Policy
{
[[Focus Movement Policy.
@since 1.10]]
@ -252,11 +252,10 @@ enum Elm.Prefs.Item_Type
swallow [[swallow type, bound to an empty 'spot' on the UI meant to receive and display external content]]
}
enum Elm.Slider.Indicator_Visible_Mode
enum Efl.Ui.Slider.Indicator_Visible_Mode
{
[[
Slider's indicator visiblity mode.
[[Slider's indicator visiblity mode.
@since 1.13
]]
default, [[show indicator on mouse down or change in slider value]]
@ -265,4 +264,24 @@ enum Elm.Slider.Indicator_Visible_Mode
none [[Never show the indicator ]]
}
enum Efl.Ui.Focus.Autoscroll_Mode
{
[[Focus Autoscroll Mode
@since 1.10
]]
show, [[Directly show the focused region or item automatically.]]
none, [[Do not show the focused region or item automatically.]]
bring_in [[Bring in the focused region or item automatically which might invole the scrolling.]]
}
enum Efl.Ui.Softcursor_Mode
{
[[Software cursor mode.
@since 1.7
]]
auto, [[Auto-detect if a software cursor should be used (default).]]
on, [[Always use a softcursor.]]
off [[Never use a softcursor.]]
}

View File

@ -304,6 +304,30 @@ typedef enum _Elm_Process_State
*/
EAPI Elm_Process_State elm_process_state_get(void);
/* legacy to eo translation */
typedef Efl_Ui_Focus_Autoscroll_Mode Elm_Focus_Autoscroll_Mode;
#define ELM_FOCUS_AUTOSCROLL_MODE_SHOW EFL_UI_FOCUS_AUTOSCROLL_MODE_SHOW
#define ELM_FOCUS_AUTOSCROLL_MODE_NONE EFL_UI_FOCUS_AUTOSCROLL_MODE_NONE
#define ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN EFL_UI_FOCUS_AUTOSCROLL_MODE_BRING_IN
typedef Efl_Ui_Softcursor_Mode Elm_Softcursor_Mode;
#define ELM_SOFTCURSOR_MODE_AUTO EFL_UI_SOFTCURSOR_MODE_AUTO
#define ELM_SOFTCURSOR_MODE_ON EFL_UI_SOFTCURSOR_MODE_ON
#define ELM_SOFTCURSOR_MODE_OFF EFL_UI_SOFTCURSOR_MODE_OFF
typedef Efl_Ui_Slider_Indicator_Visible_Mode Elm_Slider_Indicator_Visible_Mode;
#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT
#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS
#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS
#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE
typedef Efl_Ui_Focus_Move_Policy Elm_Focus_Move_Policy;
#define ELM_FOCUS_MOVE_POLICY_CLICK EFL_UI_FOCUS_MOVE_POLICY_CLICK
#define ELM_FOCUS_MOVE_POLICY_IN EFL_UI_FOCUS_MOVE_POLICY_IN
#define ELM_FOCUS_MOVE_POLICY_KEY_ONLY EFL_UI_FOCUS_MOVE_POLICY_KEY_ONLY
/**
* @}
*/

View File

@ -129,7 +129,7 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress,
[[Get the visible mode of indicator.]]
}
values {
indicator_visible_mode: Elm.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
indicator_visible_mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
}
}
@property indicator_format_function {