summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2016-05-21 09:54:42 +0100
committerAndy Williams <andy@andywilliams.me>2016-05-21 09:54:42 +0100
commit278ec8383ab50f3b471c800da574bdc79ba6947e (patch)
tree454e004fb827d953f8b6b94c87a24271680c5af5
parentd93db5bcaa357972c870ca99bbeb25b8467df1f7 (diff)
downloadefl-278ec8383ab50f3b471c800da574bdc79ba6947e.tar.gz
elementary: Icon config don't disable elements
Use some smarter logic to make elementary vs fdo selection mutually exclusive
-rw-r--r--src/bin/elementary/config.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/bin/elementary/config.c b/src/bin/elementary/config.c
index d35d91bec2..bb1dd42022 100644
--- a/src/bin/elementary/config.c
+++ b/src/bin/elementary/config.c
@@ -1541,13 +1541,24 @@ _icon_elm_change(void *data EINA_UNUSED,
{
Evas_Object *win = elm_object_top_widget_get(obj);
Eina_Bool val = elm_check_state_get(obj);
+ Elm_Object_Item *item;
if (val)
- evas_object_data_set(win, "icon_theme", ELM_CONFIG_ICON_THEME_ELEMENTARY);
+ {
+ evas_object_data_set(win, "icon_theme", ELM_CONFIG_ICON_THEME_ELEMENTARY);
+
+ item = elm_list_selected_item_get(icon_theme_list);
+ if (item)
+ elm_list_item_selected_set(item, EINA_FALSE);
+ }
else
- evas_object_data_set(win, "icon_theme", "hicolor");
+ {
+ evas_object_data_set(win, "icon_theme", "hicolor");
- elm_object_disabled_set(icon_theme_list, val);
+ item = elm_list_first_item_get(icon_theme_list);
+ if (item)
+ elm_list_item_selected_set(item, EINA_TRUE);
+ }
}
static void