elm - efl ui win - fix enum handling with explicit casts where needed
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Tue, 25 Aug 2020 07:23:25 +0000 (08:23 +0100)
committerJongmin Lee <jm105.lee@samsung.com>
Wed, 26 Aug 2020 22:18:47 +0000 (07:18 +0900)
warnings and cash enums to show we really do keep enums in sync

src/lib/elementary/efl_ui_win.c

index 7ca4c8680fb2ff01189b8f64bec2c0575605aeb4..414027690a38e82d43c34752a92179d819fc57d5 100644 (file)
@@ -2442,25 +2442,25 @@ _key_action_move(Evas_Object *obj, const char *params)
    //TIZEN_ONLY(20180607): Restore legacy focus
    efl_ui_widget_focus_cycle(obj, focus_dir);
    /*
-   // The handling for legacy is different due to elm_object_next set
-   if (elm_widget_is_legacy(obj))
-     elm_object_focus_next(obj, focus_dir);
-   else
-     {
-        Efl_Ui_Widget *o;
-
-        o = efl_ui_focus_manager_move(obj, focus_dir);
-        if (!o)
-          {
-             if (focus_dir == EFL_UI_FOCUS_DIRECTION_NEXT || focus_dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS)
-               {
-                  Efl_Ui_Focus_Object *root;
-
-                  root = efl_ui_focus_manager_root_get(obj);
-                  efl_ui_focus_manager_setup_on_first_touch(obj, focus_dir, root);
-               }
-          }
-     }
+  // The handling for legacy is different due to elm_object_next set
+  if (elm_widget_is_legacy(obj))
+    elm_object_focus_next(obj, (Elm_Focus_Direction)focus_dir);
+  else
+    {
+       Efl_Ui_Widget *o;
+
+       o = efl_ui_focus_manager_move(obj, focus_dir);
+       if (!o)
+         {
+            if (focus_dir == EFL_UI_FOCUS_DIRECTION_NEXT || focus_dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS)
+              {
+                 Efl_Ui_Focus_Object *root;
+
+                 root = efl_ui_focus_manager_root_get(obj);
+                 efl_ui_focus_manager_setup_on_first_touch(obj, focus_dir, root);
+              }
+         }
+    }
    */
    return EINA_TRUE;
 }
@@ -6527,7 +6527,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
    else if ((engine) && (!strncmp(engine, "shot:", 5)))
      _shot_init(sd);
 
-   sd->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN;
+   sd->kbdmode = EFL_UI_WIN_KEYBOARD_MODE_UNKNOWN;
    sd->legacy.indmode = ELM_WIN_INDICATOR_UNKNOWN;
    sd->indimode = EFL_UI_WIN_INDICATOR_MODE_OFF;
 
@@ -11188,7 +11188,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
 
    Evas_Object *obj = elm_legacy_add(klass, parent,
                          efl_ui_win_name_set(efl_added, name),
-                         efl_ui_win_type_set(efl_added, type));
+                         efl_ui_win_type_set(efl_added, (Efl_Ui_Win_Type)type));
 
 //TIZEN_ONLY(20160628):  Add Performance log for cold booting
    traceTaskEnd();
@@ -11252,13 +11252,13 @@ elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title
 EAPI void
 elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode)
 {
-   efl_ui_win_keyboard_mode_set(obj, mode);
+   efl_ui_win_keyboard_mode_set(obj, (Efl_Ui_Win_Keyboard_Mode)mode);
 }
 
 EAPI Elm_Win_Keyboard_Mode
 elm_win_keyboard_mode_get(const Evas_Object *obj)
 {
-   return efl_ui_win_keyboard_mode_get(obj);
+   return (Elm_Win_Keyboard_Mode)efl_ui_win_keyboard_mode_get(obj);
 }
 
 EAPI void
@@ -11455,7 +11455,7 @@ elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v)
 EAPI Eina_Bool
 elm_win_move_resize_start(Evas_Object *obj, Elm_Win_Move_Resize_Mode mode)
 {
-   return efl_ui_win_move_resize_start(obj, mode);
+   return efl_ui_win_move_resize_start(obj, (Efl_Ui_Win_Move_Resize_Mode)mode);
 }
 
 EAPI void