summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-03-11 09:37:42 -0400
committerMike Blumenkrantz <zmike@samsung.com>2020-03-11 09:37:42 -0400
commit190cf149599465620b8d5b2fef5643ba8ab3268e (patch)
tree283950d56d8d26e2375934e95e66e4f62db6caed
parent149042a3baa0c6df7c5ea8b0f549d465a5fb6975 (diff)
efl_ui/layout: skip versioning checks for legacy widgets
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
-rw-r--r--src/lib/elementary/efl_ui_layout.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 8569735005..cc1f8e93a0 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -576,6 +576,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
576 Eina_Error theme_apply_ret, theme_apply_internal_ret; 576 Eina_Error theme_apply_ret, theme_apply_internal_ret;
577 Elm_Widget_Smart_Data *wd = NULL; 577 Elm_Widget_Smart_Data *wd = NULL;
578 char buf[64]; 578 char buf[64];
579 Eina_Bool legacy;
579 static unsigned int version = 0; 580 static unsigned int version = 0;
580 581
581 sd->needs_theme_apply = EINA_FALSE; 582 sd->needs_theme_apply = EINA_FALSE;
@@ -591,9 +592,10 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
591 (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT)) 592 (theme_apply_internal_ret == EFL_UI_THEME_APPLY_ERROR_DEFAULT))
592 return EFL_UI_THEME_APPLY_ERROR_DEFAULT; 593 return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
593 594
595 legacy = elm_widget_is_legacy(obj);
594 /* unset existing size hints to force accurate recalc */ 596 /* unset existing size hints to force accurate recalc */
595 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(0, 0)); 597 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(0, 0));
596 if (elm_widget_is_legacy(obj)) 598 if (legacy)
597 efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(0, 0)); 599 efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(0, 0));
598 else 600 else
599 { 601 {
@@ -623,6 +625,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
623 } 625 }
624 if (sd->deferred_signals) 626 if (sd->deferred_signals)
625 _deferred_signals_emit(sd); 627 _deferred_signals_emit(sd);
628 if (legacy) return EFL_UI_THEME_APPLY_ERROR_NONE;
626 629
627 if (!version) 630 if (!version)
628 { 631 {