AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

GtkTextView: fix margin/padding scroll behaviour

Browse Source 
When you move line by line, only padding is
automaticly shown and you need to use Page key to show margin.

This commit also fix cursor going out of the screen bug.
This commit is contained in:
Sebastien Lafargue 2015-08-19 12:33:06 +02:00
parent 25557c1c5d
commit 8baab8f33d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtktextview.c
View File

@ -2278,7 +2278,7 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view,
screen_inner_left = screen.x + within_margin_xoffset; screen_inner_left = screen.x + within_margin_xoffset;
screen_inner_top = screen.y + within_margin_yoffset; screen_inner_top = screen.y + within_margin_yoffset;
screen_inner_right = screen.x + screen.width - within_margin_xoffset; screen_inner_right = screen.x + screen.width - within_margin_xoffset;
screen_inner_bottom = screen.y + screen.width - within_margin_yoffset; screen_inner_bottom = screen.y + screen.height - within_margin_yoffset;
buffer_bottom = priv->height - priv->bottom_border; buffer_bottom = priv->height - priv->bottom_border;
buffer_right = priv->width - priv->right_margin; buffer_right = priv->width - priv->right_margin;
@ -2325,14 +2325,14 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view,
if (cursor.y == 0) if (cursor.y == 0)
border_yoffset = (with_border) ? priv->top_padding : 0; border_yoffset = (with_border) ? priv->top_padding : 0;
screen_dest.y = cursor.y - MAX (within_margin_yoffset, border_yoffset); screen_dest.y = cursor.y + priv->top_border - MAX (within_margin_yoffset, border_yoffset);
} }
else if (cursor_bottom > screen_inner_bottom) else if (cursor_bottom > screen_inner_bottom)
{ {
if (cursor_bottom == buffer_bottom) if (cursor_bottom == buffer_bottom - priv->top_border)
border_yoffset = (with_border) ? priv->bottom_padding : 0; border_yoffset = (with_border) ? priv->bottom_padding : 0;
screen_dest.y = cursor_bottom - screen_dest.height + screen_dest.y = cursor_bottom - screen_dest.height + priv->top_border +
MAX (within_margin_yoffset, border_yoffset); MAX (within_margin_yoffset, border_yoffset);
} }
} }