Fix issue with the theme path after opening the config dialog.
This commit is contained in:
parent
06f4db94c2
commit
a3fba2995c
@ -9,13 +9,6 @@ _ecdb_about_destroy(void *data, Evas_Object *obj __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
ecore_evas_free(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_ecdb_about_free(void *data __UNUSED__, Evas *e __UNUSED__,
|
||||
Evas_Object *obj __UNUSED__,
|
||||
void *ev_info __UNUSED__)
|
||||
{
|
||||
win = NULL;
|
||||
}
|
||||
|
||||
@ -49,8 +42,6 @@ ecdb_about_show(void)
|
||||
edje_object_file_set(gui, em->theme_path, "ecdb/about");
|
||||
edje_object_signal_callback_add(gui, "ecdb/close", "ecdb",
|
||||
_ecdb_about_destroy, win);
|
||||
evas_object_event_callback_add(gui, EVAS_CALLBACK_FREE, _ecdb_about_free,
|
||||
NULL);
|
||||
ecore_evas_object_associate(win, gui, ECORE_EVAS_OBJECT_ASSOCIATE_DEL);
|
||||
edje_object_size_min_get(gui, &mw, &mh);
|
||||
if (mw <= 0) mw = 350;
|
||||
@ -61,8 +52,14 @@ ecdb_about_show(void)
|
||||
mh = (int)((float)mh * em->scalef);
|
||||
}
|
||||
ecore_evas_resize(win, mw, mh);
|
||||
evas_object_resize(gui, mw, mh);
|
||||
ecore_evas_size_min_set(win, mw, mh);
|
||||
edje_object_size_max_get(gui, &mw, &mh);
|
||||
if (ecore_config_boolean_get("use_scale"))
|
||||
{
|
||||
mw = (int)((float)mw * em->scalef);
|
||||
mh = (int)((float)mh * em->scalef);
|
||||
}
|
||||
ecore_evas_size_max_set(win, mw, mh);
|
||||
evas_object_move(gui, 0, 0);
|
||||
evas_object_show(gui);
|
||||
|
@ -294,7 +294,7 @@ theme_cb(Ewl_Widget *w, void *event __UNUSED__, void *data)
|
||||
|
||||
theme = eina_list_nth(l, idx->row);
|
||||
ecore_config_theme_set("theme", theme);
|
||||
em->theme_path = strdup(theme);
|
||||
em->theme_path = ecore_config_theme_with_path_get("theme");
|
||||
free(idx);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user