From 9fef4065b4327c64e17032fa9805752cf88f37b7 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 9 Feb 2015 13:36:03 +0000 Subject: [PATCH] [ui] fix Info box display * Text artifacts were being left due to not filling the background * Also add Danish to the list of languages for which we lost a translator :( --- src/rufus.c | 2 ++ src/rufus.h | 2 +- src/rufus.rc | 16 ++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/rufus.c b/src/rufus.c index 246efc4b..2e388535 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1514,6 +1514,8 @@ static INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LP SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetTextAlign(hdc , TA_CENTER | TA_BASELINE); GetClientRect(hCtrl , &rect); + // If you don't fill the client area, you get leftover text artifacts + FillRect(hdc, &rect, CreateSolidBrush(GetSysColor(COLOR_BTNFACE))); TextOutW(hdc, rect.right/2, rect.bottom/2 + (int)(5.0f * fScale), winfo, (int)wcslen(winfo)); EndPaint(hCtrl, &ps); return (INT_PTR)TRUE; diff --git a/src/rufus.h b/src/rufus.h index 2146a8b4..8b077cf6 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -34,7 +34,7 @@ /* Features not ready for prime time and that may *DESTROY* your data - USE AT YOUR OWN RISKS! */ // #define RUFUS_TEST /* Languages for which translators are M.I.A. and we could use help with */ -#define LOST_TRANSLATORS { "ar-SA", "hu-HU", "id-ID", "pt-PT", "es-ES" } // NB: locales MUST be <= 5 chars +#define LOST_TRANSLATORS { "ar-SA", "da-DK", "hu-HU", "id-ID", "pt-PT", "es-ES" } // NB: locales MUST be <= 5 chars /* Probability of getting the M.I.A. translator message. For more on this, see LostTranslatorCheck() */ #define LOST_TRANSLATOR_PROBABILITY 1000 diff --git a/src/rufus.rc b/src/rufus.rc index 42d7032a..91d4e52d 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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.0.609" +CAPTION "Rufus 2.0.610" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.0.609" +CAPTION "Rufus 2.0.610" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.609" +CAPTION "Rufus 2.0.610" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.0.609" +CAPTION "Rufus 2.0.610" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,609,0 - PRODUCTVERSION 2,0,609,0 + FILEVERSION 2,0,610,0 + PRODUCTVERSION 2,0,610,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.0.609" + VALUE "FileVersion", "2.0.610" 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.0.609" + VALUE "ProductVersion", "2.0.610" END END BLOCK "VarFileInfo"