nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[ui] more info field fixes

Browse source 
* Prevent text selection and try to force a redraw, to ensure the text is centered on update
* Also update the libcdio 'AL' workaround
This commit is contained in:
Pete Batard 2017-07-26 11:47:02 +01:00
parent 0a3c04379b
commit bb00e220ac
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libcdio/iso9660/rock.c
View file

@ -182,12 +182,12 @@ get_rock_ridge_filename(iso9660_dir_t * p_iso9660_dir,
case SIG('P','L'): case SIG('P','L'):
case SIG('T','F'): case SIG('T','F'):
case SIG('Z','F'): case SIG('Z','F'):
case SIG('A','L'): // Kali Linux *NONSTANDARD* extension case SIG('A','L'): // libburnia's AAIP extension (used by Kali Linux)
break; break;
default: default:
/* Warn about other nonstandard Rock Ridge extensions */ /* Warn about other Rock Ridge extensions */
cdio_warn("Invalid Rock Ridge extension detected: '%c%c'\n", *chr, *(chr+1)); cdio_warn("Unsupported Rock Ridge extension detected: '%c%c'\n", *chr, *(chr+1));
goto out; break;
} }
if (rr->len == 0) goto out; /* Something got screwed up here */ if (rr->len == 0) goto out; /* Something got screwed up here */

3
src/localization.c
View file

@ -427,7 +427,8 @@ static uint64_t last_msg_time[2] = { 0, 0 };
static void PrintInfoMessage(char* msg) { static void PrintInfoMessage(char* msg) {
SetWindowTextU(hInfo, msg); SetWindowTextU(hInfo, msg);
Edit_SetSel(hInfo, -1, 0); // Make sure our field gets redrawn
SendMessage(hInfo, WM_PAINT, 0, 0);
} }
static void PrintStatusMessage(char* msg) { static void PrintStatusMessage(char* msg) {
SendMessageLU(hStatus, SB_SETTEXTW, SBT_OWNERDRAW | SB_SECTION_LEFT, msg); SendMessageLU(hStatus, SB_SETTEXTW, SBT_OWNERDRAW | SB_SECTION_LEFT, msg);

4
src/rufus.c
View file

@ -1622,6 +1622,10 @@ static INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LP
switch (message) { switch (message) {
// Prevent text selection (wich Windows seems keen on doing on its own)
case EM_SETSEL:
return (INT_PTR)TRUE;
// Prevent select (which screws up our display as it redraws the font using different settings) // Prevent select (which screws up our display as it redraws the font using different settings)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
return (INT_PTR)FALSE; return (INT_PTR)FALSE;

10
src/rufus.rc
View file

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