Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textview: Improve scroll-to-mark behavior

Browse Source 
The idea of within-margin is to scroll as little
as possible to bring the mark within the margins
defined by the factor. The code was achieving
that when scrolling down, but not when scrolling
up. This change makes things symmetrical.

Fixes: #4325
This commit is contained in:
Matthias Clasen
2021-12-01 19:35:11 -05:00
parent db46a8dd06
commit 67ad566188
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktextview.c
View File

@@ -2641,16 +2641,16 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view,
if (cursor.y < screen_inner_top)
{
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);
}
else if (cursor_bottom > screen_inner_bottom)
{
if (cursor_bottom == buffer_bottom - priv->top_margin)
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 -
MAX (within_margin_yoffset, border_yoffset);
}
}
@@ -2679,16 +2679,16 @@ _gtk_text_view_scroll_to_iter (GtkTextView *text_view,
if (cursor.x < screen_inner_left)
{
if (cursor.x == priv->left_margin)
border_xoffset = (with_border) ? priv->left_padding : 0;
border_xoffset = with_border ? priv->left_padding : 0;
screen_dest.x = cursor.x - MAX (within_margin_xoffset, border_xoffset);
}
else if (cursor_right >= screen_inner_right - 1)
{
if (cursor.x >= buffer_right - priv->right_padding)
border_xoffset = (with_border) ? priv->right_padding : 0;
border_xoffset = with_border ? priv->right_padding : 0;
screen_dest.x = cursor_right - screen_dest.width +
screen_dest.x = cursor_right - screen_dest.width -
MAX (within_margin_xoffset, border_xoffset) + 1;
}
}