summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2014-06-30 22:38:13 +0200
committerBoris Faure <billiob@gmail.com>2014-06-30 22:38:13 +0200
commitcd82ef6b575251060ee1960c0db951ae9e6881e6 (patch)
treefbe295deb010db3ad399571c92ab01d1f7863f20
parent371b402947c44ca4b85f58f27b132dbb5aedbec1 (diff)
handle elm_theme_overlay correctly. Closes T1370
-rw-r--r--src/bin/main.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index 2b8057d..e4d75bf 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -111,7 +111,7 @@ _win_find(Evas_Object *win)
111void change_theme(Evas_Object *win, Config *config) 111void change_theme(Evas_Object *win, Config *config)
112{ 112{
113 Win *wn; 113 Win *wn;
114 Eina_List *l; 114 const Eina_List *l;
115 Term *term; 115 Term *term;
116 116
117 wn = _win_find(win); 117 wn = _win_find(win);
@@ -126,6 +126,11 @@ void change_theme(Evas_Object *win, Config *config)
126 colors_term_init(termio_textgrid_get(term->term), edje, config); 126 colors_term_init(termio_textgrid_get(term->term), edje, config);
127 termio_config_set(term->term, config); 127 termio_config_set(term->term, config);
128 } 128 }
129
130 l = elm_theme_overlay_list_get(NULL);
131 if (l) l = eina_list_last(l);
132 if (l) elm_theme_overlay_del(NULL, l->data);
133 elm_theme_overlay_add(NULL, config_theme_path_get(config));
129} 134}
130 135
131static void 136static void
@@ -2825,12 +2830,7 @@ elm_main(int argc, char **argv)
2825 config_init(); 2830 config_init();
2826 2831
2827 main_config = config_load("config"); 2832 main_config = config_load("config");
2828 2833
2829// elm_theme_extension_add(NULL, config_theme_path_get(main_config));
2830// elm_theme_extension_add(NULL, config_theme_path_default_get(main_config));
2831 elm_theme_overlay_add(NULL, config_theme_path_get(main_config));
2832 elm_theme_overlay_add(NULL, config_theme_path_default_get(main_config));
2833
2834 ipc_init(); 2834 ipc_init();
2835 2835
2836 config = config_fork(main_config); 2836 config = config_fork(main_config);
@@ -3056,6 +3056,9 @@ elm_main(int argc, char **argv)
3056 } 3056 }
3057 login_shell = config->login_shell; 3057 login_shell = config->login_shell;
3058 3058
3059 elm_theme_overlay_add(NULL, config_theme_path_default_get(config));
3060 elm_theme_overlay_add(NULL, config_theme_path_get(config));
3061
3059remote: 3062remote:
3060 if ((!single) && (config->multi_instance)) 3063 if ((!single) && (config->multi_instance))
3061 { 3064 {