Revert "force grid size. Closes T662"

This reverts commit 98fd3b0a11.

this causes terminology to no longer handle resizes at all! :( pretty
bad!
devs/stefan/coverity-fixes
Carsten Haitzler 9 years ago
parent 98fd3b0a11
commit ff02942bdb
  1. 22
      src/bin/main.c
  2. 12
      src/bin/termio.c

@ -2425,6 +2425,16 @@ main_ipc_new(Ipc_Instance *inst)
}
config = config_fork(main_config);
ecore_app_args_set(nargc, (const char **)nargv);
wn = main_win_new(inst->name, inst->role, inst->title, inst->icon_name,
config, inst->fullscreen, inst->iconic,
inst->borderless, inst->override, inst->maximized);
if (!wn)
{
ecore_app_args_set(pargc, (const char **)pargv);
free(nargv);
config_del(config);
return;
}
config = config_fork(config);
@ -2483,18 +2493,6 @@ main_ipc_new(Ipc_Instance *inst)
if (inst->w <= 0) inst->w = 80;
if (inst->h <= 0) inst->h = 24;
wn = main_win_new(inst->name, inst->role, inst->title, inst->icon_name,
config, inst->fullscreen, inst->iconic,
inst->borderless, inst->override, inst->maximized);
if (!wn)
{
ecore_app_args_set(pargc, (const char **)pargv);
free(nargv);
config_del(config);
return;
}
term = main_term_new(wn, config, inst->cmd, inst->login_shell,
inst->cd, inst->w, inst->h, inst->hold);
if (!term)

@ -3899,9 +3899,8 @@ _smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
if ((ow == w) && (oh == h)) return;
evas_object_smart_changed(obj);
if (!sd->delayed_size_timer)
sd->delayed_size_timer = ecore_timer_add(0.0, _smart_cb_delayed_size,
obj);
if (!sd->delayed_size_timer) sd->delayed_size_timer =
ecore_timer_add(0.0, _smart_cb_delayed_size, obj);
else ecore_timer_delay(sd->delayed_size_timer, 0.0);
evas_object_resize(sd->event, ow, oh);
}
@ -3916,17 +3915,14 @@ _smart_calculate(Evas_Object *obj)
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
evas_object_move(sd->grid.obj, ox, oy);
evas_object_move(sd->event, ox, oy);
evas_object_resize(sd->event, ow, oh);
evas_object_resize(obj,
sd->grid.w * sd->font.chw,
sd->grid.h * sd->font.chh);
evas_object_resize(sd->grid.obj,
sd->grid.w * sd->font.chw,
sd->grid.h * sd->font.chh);
evas_object_move(sd->cursor.obj,
ox + (sd->cursor.x * sd->font.chw),
oy + (sd->cursor.y * sd->font.chh));
evas_object_move(sd->event, ox, oy);
evas_object_resize(sd->event, ow, oh);
}
static void

Loading…
Cancel
Save