forked from enlightenment/terminology
stop jumping down to the bottm on config changes when no font sz changed
This commit is contained in:
parent
81eb162afd
commit
7c652b6714
|
@ -213,8 +213,7 @@ termio_scroll_delta(Evas_Object *obj, int delta, int by_page)
|
||||||
delta *= by;
|
delta *= by;
|
||||||
}
|
}
|
||||||
sd->scroll += delta;
|
sd->scroll += delta;
|
||||||
if (delta <= 0 && sd->scroll < 0)
|
if ((delta <= 0) && (sd->scroll < 0)) sd->scroll = 0;
|
||||||
sd->scroll = 0;
|
|
||||||
termio_smart_update_queue(sd);
|
termio_smart_update_queue(sd);
|
||||||
miniview_position_offset(term_miniview_get(sd->term), -delta, EINA_TRUE);
|
miniview_position_offset(term_miniview_get(sd->term), -delta, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
@ -365,11 +364,15 @@ _font_size_set(Evas_Object *obj, int size)
|
||||||
Termio *sd = evas_object_smart_data_get(obj);
|
Termio *sd = evas_object_smart_data_get(obj);
|
||||||
Config *config;
|
Config *config;
|
||||||
EINA_SAFETY_ON_NULL_RETURN(sd);
|
EINA_SAFETY_ON_NULL_RETURN(sd);
|
||||||
|
int font_size_scale;
|
||||||
|
|
||||||
config = sd->config;
|
config = sd->config;
|
||||||
|
|
||||||
if (size < 5) size = 5;
|
if (size < 5) size = 5;
|
||||||
else if (size > 100) size = 100;
|
else if (size > 100) size = 100;
|
||||||
|
font_size_scale = ELM_SCALE_SIZE(size);
|
||||||
|
if (sd->font_size_scale == font_size_scale) return;
|
||||||
|
sd->font_size_scale = font_size_scale;
|
||||||
if (config)
|
if (config)
|
||||||
{
|
{
|
||||||
config->temporary = EINA_TRUE;
|
config->temporary = EINA_TRUE;
|
||||||
|
@ -3561,8 +3564,7 @@ _smart_pty_change(void *data)
|
||||||
EINA_SAFETY_ON_NULL_RETURN(sd);
|
EINA_SAFETY_ON_NULL_RETURN(sd);
|
||||||
|
|
||||||
// if scroll to bottom on updates
|
// if scroll to bottom on updates
|
||||||
if (sd->jump_on_change)
|
if (sd->jump_on_change) sd->scroll = 0;
|
||||||
sd->scroll = 0;
|
|
||||||
termio_smart_update_queue(sd);
|
termio_smart_update_queue(sd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2190,8 +2190,7 @@ termio_internal_mouse_wheel(Termio *sd,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sd->scroll -= (ev->z * 4);
|
sd->scroll -= (ev->z * 4);
|
||||||
if (sd->scroll < 0)
|
if (sd->scroll < 0) sd->scroll = 0;
|
||||||
sd->scroll = 0;
|
|
||||||
termio_smart_update_queue(sd);
|
termio_smart_update_queue(sd);
|
||||||
miniview_position_offset(term_miniview_get(sd->term),
|
miniview_position_offset(term_miniview_get(sd->term),
|
||||||
ev->z * 4, EINA_TRUE);
|
ev->z * 4, EINA_TRUE);
|
||||||
|
|
|
@ -68,6 +68,7 @@ struct _Termio
|
||||||
Evas_Object *ctxpopup;
|
Evas_Object *ctxpopup;
|
||||||
int zoom_fontsize_start;
|
int zoom_fontsize_start;
|
||||||
int scroll;
|
int scroll;
|
||||||
|
int font_size_scale;
|
||||||
Evas_Object *self;
|
Evas_Object *self;
|
||||||
Evas_Object *event;
|
Evas_Object *event;
|
||||||
Term *term;
|
Term *term;
|
||||||
|
|
Loading…
Reference in New Issue