efl_ui/layout: skip versioning checks for legacy widgets
authorMike Blumenkrantz <zmike@samsung.com>
Wed, 11 Mar 2020 13:37:42 +0000 (09:37 -0400)
committerJongmin Lee <jm105.lee@samsung.com>
Thu, 12 Mar 2020 00:29:12 +0000 (09:29 +0900)
Summary:
legacy widgets are always stable

fix T8630

Reviewers: eagleeye

Reviewed By: eagleeye

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T8630

Differential Revision: https://phab.enlightenment.org/D11481

src/lib/elementary/efl_ui_layout.c

index 55b3360..364d4f6 100644 (file)
@@ -662,6 +662,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
    Eina_Error theme_apply_ret, theme_apply_internal_ret;
    Elm_Widget_Smart_Data *wd = NULL;
    char buf[64];
+   Eina_Bool legacy;
    static unsigned int version = 0;
 
    sd->needs_theme_apply = EINA_FALSE;
@@ -677,9 +678,10 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
        (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT))
      return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
 
+   legacy = elm_widget_is_legacy(obj);
    /* unset existing size hints to force accurate recalc */
    efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(0, 0));
-   if (elm_widget_is_legacy(obj))
+   if (legacy)
      efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(0, 0));
    else
      {
@@ -709,6 +711,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
      }
    if (sd->deferred_signals)
      _deferred_signals_emit(sd);
+   if (legacy) return EFL_UI_THEME_APPLY_ERROR_NONE;
 
    if (!version)
      {