thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4a.024

Browse Source 
Problem:    X11 GUI: Checking icon height twice.
Solution:   Check height and width. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2013-07-14 15:06:50 +02:00
parent 6f394f88b8
commit 6f2926692b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui_x11.c
View File

@@ -1503,14 +1503,13 @@ gui_mch_init()
if (XGetIconSizes(XtDisplay(vimShell), root_window,
&size, &number_sizes) != 0)
{
if (number_sizes > 0)
{
if (size->max_height >= 48 && size->max_height >= 48)
if (size->max_height >= 48 && size->max_width >= 48)
magick = vim48x48;
else if (size->max_height >= 32 && size->max_height >= 32)
else if (size->max_height >= 32 && size->max_width >= 32)
magick = vim32x32;
else if (size->max_height >= 16 && size->max_height >= 16)
else if (size->max_height >= 16 && size->max_width >= 16)
magick = vim16x16;
}
}

2
src/version.c
View File

@@ -727,6 +727,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
24,
/**/
23,
/**/