aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.1150: MS-Windows GUI: dialog font size is incorrect

Browse Source 
Problem:    MS-Windows GUI: dialog font size is incorrect.
Solution:   Pass flag to indicate 'encoding' or active codepage. (Yasuhiro
            Matsomoto, closes #2160)
This commit is contained in:
Bram Moolenaar
2017-09-26 14:46:04 +02:00
parent a8fc0d3817
commit 6edeaf387c
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui_w32.c
View File

@@ -4384,7 +4384,7 @@ add_dialog_element(
WORD clss, WORD clss,
const char *caption); const char *caption);
static LPWORD lpwAlign(LPWORD); static LPWORD lpwAlign(LPWORD);
static int nCopyAnsiToWideChar(LPWORD, LPSTR); static int nCopyAnsiToWideChar(LPWORD, LPSTR, BOOL);
#if defined(FEAT_MENU) && defined(FEAT_TEAROFF) #if defined(FEAT_MENU) && defined(FEAT_TEAROFF)
static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY); static void gui_mch_tearoff(char_u *title, vimmenu_T *menu, int initX, int initY);
#endif #endif
@@ -7284,9 +7284,8 @@ gui_mch_dialog(
add_word(0); // Class add_word(0); // Class
/* copy the title of the dialog */ /* copy the title of the dialog */
nchar = nCopyAnsiToWideChar(p, (title ? nchar = nCopyAnsiToWideChar(p, (title ? (LPSTR)title
(LPSTR)title : : (LPSTR)("Vim "VIM_VERSION_MEDIUM)), TRUE);
(LPSTR)("Vim "VIM_VERSION_MEDIUM)));
p += nchar; p += nchar;
if (s_usenewlook) if (s_usenewlook)
@@ -7298,13 +7297,13 @@ gui_mch_dialog(
/* point size */ /* point size */
*p++ = -MulDiv(lfSysmenu.lfHeight, 72, *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
GetDeviceCaps(hdc, LOGPIXELSY)); GetDeviceCaps(hdc, LOGPIXELSY));
nchar = nCopyAnsiToWideChar(p, TEXT(lfSysmenu.lfFaceName)); nchar = nCopyAnsiToWideChar(p, lfSysmenu.lfFaceName, FALSE);
} }
else else
#endif #endif
{ {
*p++ = DLG_FONT_POINT_SIZE; // point size *p++ = DLG_FONT_POINT_SIZE; // point size
nchar = nCopyAnsiToWideChar(p, TEXT(DLG_FONT_NAME)); nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
} }
p += nchar; p += nchar;
} }
@@ -7485,7 +7484,7 @@ add_dialog_element(
*p++ = (WORD)0xffff; *p++ = (WORD)0xffff;
*p++ = clss; //2 more here *p++ = clss; //2 more here
nchar = nCopyAnsiToWideChar(p, (LPSTR)caption); //strlen(caption)+1 nchar = nCopyAnsiToWideChar(p, (LPSTR)caption, TRUE); //strlen(caption)+1
p += nchar; p += nchar;
*p++ = 0; // advance pointer over nExtraStuff WORD - 2 more *p++ = 0; // advance pointer over nExtraStuff WORD - 2 more
@@ -7517,11 +7516,13 @@ lpwAlign(
* parameter as wide character (16-bits / char) string, and returns integer * parameter as wide character (16-bits / char) string, and returns integer
* number of wide characters (words) in string (including the trailing wide * number of wide characters (words) in string (including the trailing wide
* char NULL). Partly taken from the Win32SDK samples. * char NULL). Partly taken from the Win32SDK samples.
*/ * If "use_enc" is TRUE, 'encoding' is used for "lpAnsiIn". If FALSE, current
* ACP is used for "lpAnsiIn". */
static int static int
nCopyAnsiToWideChar( nCopyAnsiToWideChar(
LPWORD lpWCStr, LPWORD lpWCStr,
LPSTR lpAnsiIn) LPSTR lpAnsiIn,
BOOL use_enc)
{ {
int nChar = 0; int nChar = 0;
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
@@ -7529,7 +7530,7 @@ nCopyAnsiToWideChar(
int i; int i;
WCHAR *wn; WCHAR *wn;
if (enc_codepage == 0 && (int)GetACP() != enc_codepage) if (use_enc && enc_codepage >= 0 && (int)GetACP() != enc_codepage)
{ {
/* Not a codepage, use our own conversion function. */ /* Not a codepage, use our own conversion function. */
wn = enc_to_utf16((char_u *)lpAnsiIn, NULL); wn = enc_to_utf16((char_u *)lpAnsiIn, NULL);
@@ -7852,8 +7853,8 @@ gui_mch_tearoff(
/* copy the title of the dialog */ /* copy the title of the dialog */
nchar = nCopyAnsiToWideChar(p, ((*title) nchar = nCopyAnsiToWideChar(p, ((*title)
? (LPSTR)title ? (LPSTR)title
: (LPSTR)("Vim "VIM_VERSION_MEDIUM))); : (LPSTR)("Vim "VIM_VERSION_MEDIUM)), TRUE);
p += nchar; p += nchar;
if (s_usenewlook) if (s_usenewlook)
@@ -7865,13 +7866,13 @@ gui_mch_tearoff(
/* point size */ /* point size */
*p++ = -MulDiv(lfSysmenu.lfHeight, 72, *p++ = -MulDiv(lfSysmenu.lfHeight, 72,
GetDeviceCaps(hdc, LOGPIXELSY)); GetDeviceCaps(hdc, LOGPIXELSY));
nchar = nCopyAnsiToWideChar(p, TEXT(lfSysmenu.lfFaceName)); nchar = nCopyAnsiToWideChar(p, lfSysmenu.lfFaceName, FALSE);
} }
else else
#endif #endif
{ {
*p++ = DLG_FONT_POINT_SIZE; // point size *p++ = DLG_FONT_POINT_SIZE; // point size
nchar = nCopyAnsiToWideChar (p, TEXT(DLG_FONT_NAME)); nchar = nCopyAnsiToWideChar(p, DLG_FONT_NAME, FALSE);
} }
p += nchar; p += nchar;
} }

2
src/version.c
View File

@@ -761,6 +761,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 */
/**/
1150,
/**/ /**/
1149, 1149,
/**/ /**/