[loc] fix RTL display for the Info box

* Another issue from #621
* Also add ETO_NUMERICSLOCAL flag
This commit is contained in:
Pete Batard 2015-10-22 18:25:40 +01:00
parent c461cc8148
commit 36bf6c7036
2 changed files with 8 additions and 6 deletions

View File

@ -1616,7 +1616,9 @@ static INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LP
GetClientRect(hCtrl , &rect);
// If you don't fill the client area, you get leftover text artifacts
FillRect(hdc, &rect, hInfoBrush);
ExtTextOutW(hdc, rect.right/2, rect.bottom/2 + (int)(5.0f * fScale), ETO_CLIPPED, &rect, winfo, (int)wcslen(winfo), NULL);
ExtTextOutW(hdc, rect.right/2, rect.bottom/2 + (int)(5.0f * fScale),
ETO_CLIPPED | ETO_NUMERICSLOCAL | (right_to_left_mode?ETO_RTLREADING:0),
&rect, winfo, (int)wcslen(winfo), NULL);
EndPaint(hCtrl, &ps);
return (INT_PTR)TRUE;
}

View File

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.5.788"
CAPTION "Rufus 2.5.789"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -319,8 +319,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,5,788,0
PRODUCTVERSION 2,5,788,0
FILEVERSION 2,5,789,0
PRODUCTVERSION 2,5,789,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -337,13 +337,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.5.788"
VALUE "FileVersion", "2.5.789"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.5.788"
VALUE "ProductVersion", "2.5.789"
END
END
BLOCK "VarFileInfo"