summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 10:47:52 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:16:59 -0800
commitf733332a9c749615ef8381a7494276a10c6cb327 (patch)
tree64a3814b38e8781e93995871c54d2901fee2d42d
parent14df465ce3c3bee305535b448bd58a5eae8bbab0 (diff)
elm_general: remove linkage between legacy enums and eo types
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D8224
-rw-r--r--src/lib/elementary/elm_general.h83
1 files changed, 54 insertions, 29 deletions
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 4e7a235a9c..94f0007d66 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -21,16 +21,17 @@
21// Legacy types 21// Legacy types
22#include "elm_general.eot.h" 22#include "elm_general.eot.h"
23 23
24// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
25#include "efl_ui.eot.h"
26 24
27#define ELM_FOCUS_PREVIOUS EFL_UI_FOCUS_DIRECTION_PREVIOUS 25typedef enum
28#define ELM_FOCUS_NEXT EFL_UI_FOCUS_DIRECTION_NEXT 26{
29#define ELM_FOCUS_UP EFL_UI_FOCUS_DIRECTION_UP 27 ELM_FOCUS_PREVIOUS = 0, /**< previous direction */
30#define ELM_FOCUS_DOWN EFL_UI_FOCUS_DIRECTION_DOWN 28 ELM_FOCUS_NEXT = 1, /**< next direction */
31#define ELM_FOCUS_RIGHT EFL_UI_FOCUS_DIRECTION_RIGHT 29 ELM_FOCUS_UP = 2, /**< up direction */
32#define ELM_FOCUS_LEFT EFL_UI_FOCUS_DIRECTION_LEFT 30 ELM_FOCUS_DOWN = 3, /**< down direction */
33typedef Efl_Ui_Focus_Direction Elm_Focus_Direction; 31 ELM_FOCUS_RIGHT = 4, /**< right direction */
32 ELM_FOCUS_LEFT = 5, /**< left direction */
33 ELM_FOCUS_LAST = 6 /**< last direction */
34} Elm_Focus_Direction;
34 35
35/** 36/**
36 * Defines couple of standard Evas_Object layers to be used 37 * Defines couple of standard Evas_Object layers to be used
@@ -340,26 +341,50 @@ EAPI Elm_Process_State elm_process_state_get(void);
340 341
341/* legacy to eo translation */ 342/* legacy to eo translation */
342 343
343typedef Efl_Ui_Focus_Autoscroll_Mode Elm_Focus_Autoscroll_Mode; 344typedef enum
344#define ELM_FOCUS_AUTOSCROLL_MODE_SHOW EFL_UI_FOCUS_AUTOSCROLL_MODE_SHOW 345{
345#define ELM_FOCUS_AUTOSCROLL_MODE_NONE EFL_UI_FOCUS_AUTOSCROLL_MODE_NONE 346 ELM_FOCUS_AUTOSCROLL_MODE_SHOW = 0, /**< Directly show the focused region
346#define ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN EFL_UI_FOCUS_AUTOSCROLL_MODE_BRING_IN 347 * or item automatically. */
347 348 ELM_FOCUS_AUTOSCROLL_MODE_NONE, /**< Do not show the focused region or item
348typedef Efl_Ui_Softcursor_Mode Elm_Softcursor_Mode; 349 * automatically. */
349#define ELM_SOFTCURSOR_MODE_AUTO EFL_UI_SOFTCURSOR_MODE_AUTO 350 ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN /**< Bring in the focused region or item
350#define ELM_SOFTCURSOR_MODE_ON EFL_UI_SOFTCURSOR_MODE_ON 351 * automatically which might invole the
351#define ELM_SOFTCURSOR_MODE_OFF EFL_UI_SOFTCURSOR_MODE_OFF 352 * scrolling. */
352 353} Elm_Focus_Autoscroll_Mode;
353typedef Efl_Ui_Slider_Indicator_Visible_Mode Elm_Slider_Indicator_Visible_Mode; 354
354#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_DRAG 355typedef enum
355#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS 356{
356#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS 357 ELM_SOFTCURSOR_MODE_AUTO = 0, /**< Auto-detect if a software cursor should
357#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE 358 * be used (default). */
358 359 ELM_SOFTCURSOR_MODE_ON, /**< Always use a softcursor. */
359typedef Efl_Ui_Focus_Move_Policy Elm_Focus_Move_Policy; 360 ELM_SOFTCURSOR_MODE_OFF /**< Never use a softcursor. */
360#define ELM_FOCUS_MOVE_POLICY_CLICK EFL_UI_FOCUS_MOVE_POLICY_CLICK 361} Elm_Softcursor_Mode;
361#define ELM_FOCUS_MOVE_POLICY_IN EFL_UI_FOCUS_MOVE_POLICY_IN 362
362#define ELM_FOCUS_MOVE_POLICY_KEY_ONLY EFL_UI_FOCUS_MOVE_POLICY_KEY_ONLY 363typedef enum
364{
365 ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT = 0, /**< show indicator on mouse
366 * down or change in slider
367 * value */
368 ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, /**< Always show the indicator.
369 */
370 ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS, /**< Show the indicator on
371 * focus */
372 ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE /**< Never show the indicator */
373} Elm_Slider_Indicator_Visible_Mode;
374
375typedef enum
376{
377 ELM_FOCUS_MOVE_POLICY_CLICK = 0, /**< Move focus by mouse click or touch.
378 * Elementary focus is set on mouse click
379 * and this is checked at mouse up time.
380 * (default) */
381 ELM_FOCUS_MOVE_POLICY_IN, /**< Move focus by mouse in. Elementary focus is
382 * set on mouse move when the mouse pointer is
383 * moved into an object. */
384 ELM_FOCUS_MOVE_POLICY_KEY_ONLY /**< Move focus by key. Elementary focus is
385 * set on key input like Left, Right, Up,
386 * Down, Tab, or Shift+Tab. */
387} Elm_Focus_Move_Policy;
363 388
364/** 389/**
365 * @} 390 * @}