enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

terminology - fix initial size hints to be stepped right 

@fix
This commit is contained in:
Carsten Haitzler 2019-05-18 02:41:16 +01:00
parent 396041a741
commit 40ea16d995
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/termio.c
View File

@ -3006,16 +3006,20 @@ static void
_smart_size(Evas_Object *obj, int w, int h, Eina_Bool force) _smart_size(Evas_Object *obj, int w, int h, Eina_Bool force)
{ {
Termio *sd = evas_object_smart_data_get(obj); Termio *sd = evas_object_smart_data_get(obj);
Eina_Bool first_time; Evas_Coord mw = 0, mh = 0;
EINA_SAFETY_ON_NULL_RETURN(sd); EINA_SAFETY_ON_NULL_RETURN(sd);
first_time = (sd->grid.h == 0);
if ((w <= 0) || (h <= 0)) if ((w <= 0) || (h <= 0))
{ {
w = 80; w = 80;
h = 24; h = 24;
} }
evas_object_size_hint_min_get(obj, &mw, &mh);
if ((mw != sd->font.chw) || (mh != sd->font.chh))
evas_object_size_hint_min_set(obj, sd->font.chw, sd->font.chh);
if (!force) if (!force)
{ {
if ((w == sd->grid.w) && (h == sd->grid.h)) return; if ((w == sd->grid.w) && (h == sd->grid.h)) return;
@ -3025,8 +3029,6 @@ _smart_size(Evas_Object *obj, int w, int h, Eina_Bool force)
evas_event_freeze(evas_object_evas_get(obj)); evas_event_freeze(evas_object_evas_get(obj));
evas_object_textgrid_size_set(sd->grid.obj, w, h); evas_object_textgrid_size_set(sd->grid.obj, w, h);
evas_object_resize(sd->cursor.obj, sd->font.chw, sd->font.chh); evas_object_resize(sd->cursor.obj, sd->font.chw, sd->font.chh);
if (!first_time)
evas_object_size_hint_min_set(obj, sd->font.chw, sd->font.chh);
if (!sd->noreqsize) if (!sd->noreqsize)
evas_object_size_hint_request_set(obj, evas_object_size_hint_request_set(obj,
sd->font.chw * sd->grid.w, sd->font.chw * sd->grid.w,