aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.1245

Browse Source 
Problem:    MS-Windows: confirm() dialog text may still not fit.
Solution:   Use GetTextWidthEnc() instead of GetTextWidth() in two more
            places. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar 2013-06-26 13:16:20 +02:00
parent f05d81102c
commit b052fe0e2c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui_w32.c
View File

@ -3282,7 +3282,7 @@ gui_mch_dialog(
pend = vim_strchr(pstart, DLG_BUTTON_SEP); pend = vim_strchr(pstart, DLG_BUTTON_SEP);
if (pend == NULL) if (pend == NULL)
pend = pstart + STRLEN(pstart); // Last button name. pend = pstart + STRLEN(pstart); // Last button name.
textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart)); textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart));
if (textWidth < minButtonWidth) if (textWidth < minButtonWidth)
textWidth = minButtonWidth; textWidth = minButtonWidth;
textWidth += dlgPaddingX; /* Padding within button */ textWidth += dlgPaddingX; /* Padding within button */
@ -3307,7 +3307,7 @@ gui_mch_dialog(
pend = vim_strchr(pstart, DLG_BUTTON_SEP); pend = vim_strchr(pstart, DLG_BUTTON_SEP);
if (pend == NULL) if (pend == NULL)
pend = pstart + STRLEN(pstart); // Last button name. pend = pstart + STRLEN(pstart); // Last button name.
textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart)); textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart));
textWidth += dlgPaddingX; /* Padding within button */ textWidth += dlgPaddingX; /* Padding within button */
textWidth += DLG_VERT_PADDING_X * 2; /* Padding around button */ textWidth += DLG_VERT_PADDING_X * 2; /* Padding around button */
if (textWidth > dlgwidth) if (textWidth > dlgwidth)

2
src/version.c
View File

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