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
index 3ee2957709a3071887fbd4b1a0ead33cdd387882..359bf64fe9add279fa1d6a0e149c964c44f8ea86 100644 (file)
--- 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
index 2f1f04f0469f5e6dfb92ac783df7cd15a749cf05..6b194bc0d1d1222d904e6a0b6102a3a784eb91c2 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -871,12 +871,14 @@ static char *(p_toolbar_values[]) = {"text", "icons", "tooltips", "horiz", NULL}
 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
index a760c76059c02aace311bfec5f3902a38eafa374..f27cd552c9470080834afa6992f5c51b54b87f09 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1525,
 /**/
     1524,
 /**/