summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-11-07 23:00:36 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-11-11 13:44:57 +0100
commit4c8a764b49bab346bccbcac3c411df94448ff042 (patch)
tree0b6a4206c7dcddaefd676ad15c4afae29194563d
parent6b1de6a4ac4afac779d873f292757c943331540d (diff)
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
-rw-r--r--src/lib/elementary/elm_gengrid.c1
-rw-r--r--src/lib/elementary/elm_genlist.c1
-rw-r--r--src/lib/elementary/elm_list.c3
-rw-r--r--src/lib/elementary/elm_map.c3
-rw-r--r--src/lib/elementary/elm_panel.c1
-rw-r--r--src/lib/elementary/elm_scroller.c1
-rw-r--r--src/lib/elementary/elm_toolbar.c1
7 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index f30dfe6..36206fd 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
3623 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 3623 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3624 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 3624 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
3625 3625
3626 elm_interface_scrollable_reset_signals(obj);
3626 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3627 _mirrored_set(obj, efl_ui_mirrored_get(obj));
3627 3628
3628 return int_ret; 3629 return int_ret;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 9f2fb8e..65bc518 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)
3562 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 3562 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3563 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 3563 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
3564 3564
3565 elm_interface_scrollable_reset_signals(obj);
3565 e = evas_object_evas_get(obj); 3566 e = evas_object_evas_get(obj);
3566 evas_event_freeze(e); 3567 evas_event_freeze(e);
3567 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3568 _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 0483137..7414bd2 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)
1139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1140 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 1140 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1141 1141
1142 elm_interface_scrollable_reset_signals(obj);
1143
1142 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 1144 _mirrored_set(obj, efl_ui_mirrored_get(obj));
1143 1145
1144 EINA_LIST_FOREACH(sd->items, n, eo_it) 1146 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)
1150 } 1152 }
1151 1153
1152 _items_fix(obj); 1154 _items_fix(obj);
1153
1154 elm_layout_sizing_eval(obj); 1155 elm_layout_sizing_eval(obj);
1155 1156
1156 return int_ret; 1157 return int_ret;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 4549f7c..6a37e59 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)
4002 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 4002 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
4003 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 4003 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
4004 4004
4005
4006 elm_widget_theme_object_set 4005 elm_widget_theme_object_set
4007 (obj, wd->resize_obj, "map", "base", elm_widget_style_get(obj)); 4006 (obj, wd->resize_obj, "map", "base", elm_widget_style_get(obj));
4008 4007 elm_interface_scrollable_reset_signals(obj);
4009 _sizing_eval(obj); 4008 _sizing_eval(obj);
4010 4009
4011 return int_ret; 4010 return int_ret;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 1468d81..97f4267 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)
223 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 223 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
224 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 224 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
225 225
226 elm_interface_scrollable_reset_signals(obj);
226 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 227 _mirrored_set(obj, efl_ui_mirrored_get(obj));
227 228
228 if (sd->scrollable) 229 if (sd->scrollable)
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 5f47874..8d20030 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
406 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 406 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
407 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 407 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
408 408
409 elm_interface_scrollable_reset_signals(obj);
409 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 410 _mirrored_set(obj, efl_ui_mirrored_get(obj));
410 411
411 elm_layout_sizing_eval(obj); 412 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 273fb25..d6763ce 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)
1511 elm_widget_theme_object_set 1511 elm_widget_theme_object_set
1512 (obj, wd->resize_obj, "toolbar", "base", 1512 (obj, wd->resize_obj, "toolbar", "base",
1513 elm_widget_style_get(obj)); 1513 elm_widget_style_get(obj));
1514 elm_interface_scrollable_reset_signals(obj);
1514 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) 1515 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1515 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm"); 1516 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm");
1516 else 1517 else