bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4c8a764b49bab346bccbcac3c411df94448ff042
commit 4c8a764b49bab346bccbcac3c411df94448ff042
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Thu Nov 7 23:00:36 2019 +0100
elm: apply the same fix we needed in entry to other scrollable widgets
this here is the same effect as in my previous commit:
When re retheme a object, we need to reset the signals, otherwise there
would be wrongly displayed scrollbars.
This fixes wrong scrollbars in enlightenment.
Differential Revision: https://phab.enlightenment.org/D10628
---
src/lib/elementary/elm_gengrid.c | 1 +
src/lib/elementary/elm_genlist.c | 1 +
src/lib/elementary/elm_list.c | 3 ++-
src/lib/elementary/elm_map.c | 3 +--
src/lib/elementary/elm_panel.c | 1 +
src/lib/elementary/elm_scroller.c | 1 +
src/lib/elementary/elm_toolbar.c | 1 +
7 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index f30dfe6b3a..36206fd375 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3623,6 +3623,7 @@ _elm_gengrid_efl_ui_widget_theme_apply(Eo *obj,
Elm_Gengrid_Data *sd EINA_UNUSED
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
+ elm_interface_scrollable_reset_signals(obj);
_mirrored_set(obj, efl_ui_mirrored_get(obj));
return int_ret;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 9f2fb8e4a0..65bc5182b5 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3562,6 +3562,7 @@ _elm_genlist_efl_ui_widget_theme_apply(Eo *obj,
Elm_Genlist_Data *sd)
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
+ elm_interface_scrollable_reset_signals(obj);
e = evas_object_evas_get(obj);
evas_event_freeze(e);
_mirrored_set(obj, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 04831372c5..7414bd2559 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1139,6 +1139,8 @@ _elm_list_efl_ui_widget_theme_apply(Eo *obj,
Elm_List_Data *sd)
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
+ elm_interface_scrollable_reset_signals(obj);
+
_mirrored_set(obj, efl_ui_mirrored_get(obj));
EINA_LIST_FOREACH(sd->items, n, eo_it)
@@ -1150,7 +1152,6 @@ _elm_list_efl_ui_widget_theme_apply(Eo *obj,
Elm_List_Data *sd)
}
_items_fix(obj);
-
elm_layout_sizing_eval(obj);
return int_ret;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 4549f7cb1f..6a37e59cb2 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4002,10 +4002,9 @@ _elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data
*sd EINA_UNUSED)
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
-
elm_widget_theme_object_set
(obj, wd->resize_obj, "map", "base", elm_widget_style_get(obj));
-
+ elm_interface_scrollable_reset_signals(obj);
_sizing_eval(obj);
return int_ret;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 1468d810c5..97f4267b2b 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -223,6 +223,7 @@ _elm_panel_efl_ui_widget_theme_apply(Eo *obj,
Elm_Panel_Data *sd)
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
+ elm_interface_scrollable_reset_signals(obj);
_mirrored_set(obj, efl_ui_mirrored_get(obj));
if (sd->scrollable)
diff --git a/src/lib/elementary/elm_scroller.c
b/src/lib/elementary/elm_scroller.c
index 5f47874b90..8d20030a91 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -406,6 +406,7 @@ _elm_scroller_efl_ui_widget_theme_apply(Eo *obj,
Elm_Scroller_Data *sd EINA_UNUS
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
+ elm_interface_scrollable_reset_signals(obj);
_mirrored_set(obj, efl_ui_mirrored_get(obj));
elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 273fb25f1b..d6763cebb6 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -1511,6 +1511,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj,
Elm_Toolbar_Data *sd)
elm_widget_theme_object_set
(obj, wd->resize_obj, "toolbar", "base",
elm_widget_style_get(obj));
+ elm_interface_scrollable_reset_signals(obj);
if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm");
else
--
