diff options
| -rw-r--r-- | src/gui_gtk.c | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c index 48910b287..c172fa49d 100644 --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -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; } /* diff --git a/src/version.c b/src/version.c index 2b0955c5a..8a95e6750 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2709, +/**/ 2708, /**/ 2707, |