# HG changeset patch # User Christian Brabandt # Date 1457474404 -3600 # Node ID 42020d59a432e64d08752bb2aa0702f590089849 # Parent 846d3556abc92adf1e78a525a2f146774e0dc9c0 commit https://github.com/vim/vim/commit/beb003b303cde1e55634aae9f810535684b76211 Author: Bram Moolenaar Date: Tue Mar 8 22:47:17 2016 +0100 patch 7.4.1525 Problem: On a high resolution screen the toolbar icons are too small. Solution: Add "huge" and "giant" to 'toolbariconsize'. (Brian Gix) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3346,6 +3346,8 @@ set_toolbar_style(GtkToolbar *toolbar) case TBIS_SMALL: size = GTK_ICON_SIZE_SMALL_TOOLBAR; break; case TBIS_MEDIUM: size = GTK_ICON_SIZE_BUTTON; break; case TBIS_LARGE: size = GTK_ICON_SIZE_LARGE_TOOLBAR; break; + case TBIS_HUGE: size = GTK_ICON_SIZE_DND; break; + case TBIS_GIANT: size = GTK_ICON_SIZE_DIALOG; break; default: size = GTK_ICON_SIZE_INVALID; break; } oldsize = gtk_toolbar_get_icon_size(toolbar); diff --git a/src/option.h b/src/option.h --- a/src/option.h +++ b/src/option.h @@ -871,12 +871,14 @@ static char *(p_toolbar_values[]) = {"te EXTERN char_u *p_tbis; /* 'toolbariconsize' */ EXTERN unsigned tbis_flags; # ifdef IN_OPTION_C -static char *(p_tbis_values[]) = {"tiny", "small", "medium", "large", NULL}; +static char *(p_tbis_values[]) = {"tiny", "small", "medium", "large", "huge", "giant", NULL}; # endif # define TBIS_TINY 0x01 # define TBIS_SMALL 0x02 # define TBIS_MEDIUM 0x04 # define TBIS_LARGE 0x08 +# define TBIS_HUGE 0x10 +# define TBIS_GIANT 0x20 #endif EXTERN long p_ttyscroll; /* 'ttyscroll' */ #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS)) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1525, +/**/ 1524, /**/ 1523,