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] update progress bar position for screen readers

Browse source 
* Make sure to call the original winproc on PBM_SETPOS and friends.
* Closes #1289
This commit is contained in:
Pete Batard 2019-06-14 13:02:35 +01:00
parent 861f51169e
commit 24e8307d9a
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
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 3.6.1540" CAPTION "Rufus 3.6.1541"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,1540,0 FILEVERSION 3,6,1541,0
PRODUCTVERSION 3,6,1540,0 PRODUCTVERSION 3,6,1541,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.6.1540" VALUE "FileVersion", "3.6.1541"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.6.exe" VALUE "OriginalFilename", "rufus-3.6.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.6.1540" VALUE "ProductVersion", "3.6.1541"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

3
src/ui.c
View file

@ -888,6 +888,7 @@ static INT_PTR CALLBACK ProgressCallback(HWND hCtrl, UINT message, WPARAM wParam
return (INT_PTR)TRUE; return (INT_PTR)TRUE;
case PBM_SETRANGE: case PBM_SETRANGE:
CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
// Don't bother sanity checking min and max: If *you* want to // Don't bother sanity checking min and max: If *you* want to
// be an ass about the progress bar range, it's *your* problem. // be an ass about the progress bar range, it's *your* problem.
min = (uint32_t)(lParam & 0xFFFF); min = (uint32_t)(lParam & 0xFFFF);
@ -895,11 +896,13 @@ static INT_PTR CALLBACK ProgressCallback(HWND hCtrl, UINT message, WPARAM wParam
return (INT_PTR)TRUE; return (INT_PTR)TRUE;
case PBM_SETPOS: case PBM_SETPOS:
CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
pos = (WORD)wParam; pos = (WORD)wParam;
InvalidateRect(hProgress, NULL, TRUE); InvalidateRect(hProgress, NULL, TRUE);
return (INT_PTR)TRUE; return (INT_PTR)TRUE;
case PBM_SETMARQUEE: case PBM_SETMARQUEE:
CallWindowProc(progress_original_proc, hCtrl, message, wParam, lParam);
if ((wParam == TRUE) && (!marquee_mode)) { if ((wParam == TRUE) && (!marquee_mode)) {
marquee_mode = TRUE; marquee_mode = TRUE;
pos = min; pos = min;