fix --split option
This commit is contained in:
parent
2e2c3f0a26
commit
8fe96c06a8
|
@ -20,7 +20,7 @@
|
||||||
#include "gravatar.h"
|
#include "gravatar.h"
|
||||||
#include "keyin.h"
|
#include "keyin.h"
|
||||||
|
|
||||||
|
int terminology_starting_up;
|
||||||
int _log_domain = -1;
|
int _log_domain = -1;
|
||||||
|
|
||||||
static Config *_main_config = NULL;
|
static Config *_main_config = NULL;
|
||||||
|
@ -523,6 +523,8 @@ elm_main(int argc, char **argv)
|
||||||
Eina_List *cmds_list = NULL;
|
Eina_List *cmds_list = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
terminology_starting_up = EINA_TRUE;
|
||||||
|
|
||||||
elm_language_set("");
|
elm_language_set("");
|
||||||
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
|
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
|
||||||
elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
|
elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
|
||||||
|
@ -930,6 +932,8 @@ remote:
|
||||||
ecore_con_init();
|
ecore_con_init();
|
||||||
ecore_con_url_init();
|
ecore_con_url_init();
|
||||||
|
|
||||||
|
terminology_starting_up = EINA_FALSE;
|
||||||
|
|
||||||
elm_run();
|
elm_run();
|
||||||
|
|
||||||
ecore_con_url_shutdown();
|
ecore_con_url_shutdown();
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#endif
|
#endif
|
||||||
#define gettext_noop(String) String
|
#define gettext_noop(String) String
|
||||||
|
|
||||||
|
extern int terminology_starting_up;
|
||||||
extern int _log_domain;
|
extern int _log_domain;
|
||||||
|
|
||||||
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
|
#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
|
||||||
|
|
|
@ -919,6 +919,9 @@ _term_container_is_splittable(Term_Container *tc, Eina_Bool is_horizontal)
|
||||||
int w = 0, h = 0, c_w = 0, c_h = 0;
|
int w = 0, h = 0, c_w = 0, c_h = 0;
|
||||||
Term *tm;
|
Term *tm;
|
||||||
|
|
||||||
|
if (terminology_starting_up)
|
||||||
|
return EINA_TRUE;
|
||||||
|
|
||||||
tm = tc->term_first(tc);
|
tm = tc->term_first(tc);
|
||||||
evas_object_geometry_get(tm->bg, NULL, NULL, &w, &h);
|
evas_object_geometry_get(tm->bg, NULL, NULL, &w, &h);
|
||||||
evas_object_textgrid_cell_size_get(termio_textgrid_get(tm->termio),
|
evas_object_textgrid_cell_size_get(termio_textgrid_get(tm->termio),
|
||||||
|
@ -974,6 +977,10 @@ _win_split(Term_Container *tc, Term_Container *child,
|
||||||
tc_split->is_focused = tc->is_focused;
|
tc_split->is_focused = tc->is_focused;
|
||||||
tc->swallow(tc, NULL, tc_split);
|
tc->swallow(tc, NULL, tc_split);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DBG("term is not splittable");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue