main: Keep view size set last time.
Summary: Keep view size set last time by using "live_view,loaded" enventor callback. @feature Reviewers: Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D1745
This commit is contained in:
parent
f177939cd2
commit
855373f002
|
@ -21,7 +21,7 @@ typedef struct config_s
|
||||||
|
|
||||||
void (*update_cb)(void *data);
|
void (*update_cb)(void *data);
|
||||||
void *update_cb_data;
|
void *update_cb_data;
|
||||||
Evas_Coord_Size view_size;
|
Evas_Coord view_size_w, view_size_h;
|
||||||
Evas_Coord win_size_w, win_size_h;
|
Evas_Coord win_size_w, win_size_h;
|
||||||
|
|
||||||
Eina_Bool stats_bar;
|
Eina_Bool stats_bar;
|
||||||
|
@ -212,6 +212,10 @@ eddc_init(void)
|
||||||
view_scale, EET_T_DOUBLE);
|
view_scale, EET_T_DOUBLE);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "console_size",
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "console_size",
|
||||||
console_size, EET_T_DOUBLE);
|
console_size, EET_T_DOUBLE);
|
||||||
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_size_w",
|
||||||
|
view_size_w, EET_T_INT);
|
||||||
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_size_h",
|
||||||
|
view_size_h, EET_T_INT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "win_size_w",
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "win_size_w",
|
||||||
win_size_w, EET_T_INT);
|
win_size_w, EET_T_INT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "win_size_h",
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "win_size_h",
|
||||||
|
@ -230,6 +234,9 @@ eddc_init(void)
|
||||||
tools, EET_T_UCHAR);
|
tools, EET_T_UCHAR);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "auto_complete",
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "auto_complete",
|
||||||
auto_complete, EET_T_UCHAR);
|
auto_complete, EET_T_UCHAR);
|
||||||
|
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data,
|
||||||
|
"view_size_configurable",
|
||||||
|
view_size_configurable, EET_T_UCHAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -681,8 +688,8 @@ config_view_size_set(Evas_Coord w, Evas_Coord h)
|
||||||
{
|
{
|
||||||
config_data *cd = g_cd;
|
config_data *cd = g_cd;
|
||||||
|
|
||||||
cd->view_size.w = w;
|
cd->view_size_w = w;
|
||||||
cd->view_size.h = h;
|
cd->view_size_h = h;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -690,8 +697,8 @@ config_view_size_get(Evas_Coord *w, Evas_Coord *h)
|
||||||
{
|
{
|
||||||
config_data *cd = g_cd;
|
config_data *cd = g_cd;
|
||||||
|
|
||||||
if (w) *w = cd->view_size.w;
|
if (w) *w = cd->view_size_w;
|
||||||
if (h) *h = cd->view_size.h;
|
if (h) *h = cd->view_size_h;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -391,8 +391,21 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
|
||||||
{
|
{
|
||||||
if (!config_stats_bar_get()) return;
|
if (!config_stats_bar_get()) return;
|
||||||
Enventor_Live_View_Size *size = event_info;
|
Enventor_Live_View_Size *size = event_info;
|
||||||
config_view_size_set(size->w, size->h);
|
|
||||||
stats_view_size_update(size->w, size->h);
|
stats_view_size_update(size->w, size->h);
|
||||||
|
|
||||||
|
if (!config_view_size_configurable_get())
|
||||||
|
config_view_size_set(size->w, size->h);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
enventor_live_view_loaded_cb(void *data EINA_UNUSED, Evas_Object *obj,
|
||||||
|
void *event_info)
|
||||||
|
{
|
||||||
|
if (!config_view_size_configurable_get()) return;
|
||||||
|
|
||||||
|
Evas_Coord w, h;
|
||||||
|
config_view_size_get(&w, &h);
|
||||||
|
enventor_object_live_view_size_set(obj, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -448,6 +461,8 @@ enventor_setup(app_data *ad)
|
||||||
enventor_cursor_group_changed_cb, ad);
|
enventor_cursor_group_changed_cb, ad);
|
||||||
evas_object_smart_callback_add(enventor, "compile,error",
|
evas_object_smart_callback_add(enventor, "compile,error",
|
||||||
enventor_compile_error_cb, ad);
|
enventor_compile_error_cb, ad);
|
||||||
|
evas_object_smart_callback_add(enventor, "live_view,loaded",
|
||||||
|
enventor_live_view_loaded_cb, ad);
|
||||||
evas_object_smart_callback_add(enventor, "live_view,cursor,moved",
|
evas_object_smart_callback_add(enventor, "live_view,cursor,moved",
|
||||||
enventor_live_view_cursor_moved_cb, ad);
|
enventor_live_view_cursor_moved_cb, ad);
|
||||||
evas_object_smart_callback_add(enventor, "live_view,resized",
|
evas_object_smart_callback_add(enventor, "live_view,resized",
|
||||||
|
|
Loading…
Reference in New Issue