Skip to content

Commit

Permalink
patch 8.2.2709: the GTK GUI has a gap next to the scrollbar
Browse files Browse the repository at this point in the history
Problem:    The GTK GUI has a gap next to the scrollbar.
Solution:   Calculate the scrollbar padding for GTK. (closes #8027)
  • Loading branch information
brammool committed Apr 4, 2021
1 parent 3a6aadb commit 26af8e5
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
24 changes: 18 additions & 6 deletions src/gui_gtk.c
Expand Up @@ -1011,17 +1011,29 @@ gui_mch_set_scrollbar_pos(scrollbar_T *sb, int x, int y, int w, int h)
int
gui_mch_get_scrollbar_xpadding(void)
{
// TODO: Calculate the padding for adjust scrollbar position when the
// Window is maximized.
return 0;
int xpad;
#if GTK_CHECK_VERSION(3,0,0)
xpad = gtk_widget_get_allocated_width(gui.formwin)
- gtk_widget_get_allocated_width(gui.drawarea) - gui.scrollbar_width;
#else
xpad = gui.formwin->allocation.width - gui.drawarea->allocation.width
- gui.scrollbar_width;
#endif
return (xpad < 0) ? 0 : xpad;
}

int
gui_mch_get_scrollbar_ypadding(void)
{
// TODO: Calculate the padding for adjust scrollbar position when the
// Window is maximized.
return 0;
int ypad;
#if GTK_CHECK_VERSION(3,0,0)
ypad = gtk_widget_get_allocated_height(gui.formwin)
- gtk_widget_get_allocated_height(gui.drawarea) - gui.scrollbar_height;
#else
ypad = gui.formwin->allocation.height - gui.drawarea->allocation.height
- gui.scrollbar_height;
#endif
return (ypad < 0) ? 0 : ypad;
}

/*
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2709,
/**/
2708,
/**/
Expand Down

1 comment on commit 26af8e5

@fedorenchik
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.