[ui] fix vertical alignment of status bar messages

* Also fix ugly icon scaling at 125%
This commit is contained in:
Pete Batard 2018-05-01 23:11:19 +01:00
parent de7dde05c4
commit 303978de64
3 changed files with 12 additions and 9 deletions

View File

@ -5,7 +5,7 @@ Rufus: The Reliable USB Formatting Utility
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2172/badge.svg)](https://scan.coverity.com/projects/pbatard-rufus)
[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icon-set/rufus-128.png)
![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png)
Features
--------

View File

@ -1916,7 +1916,7 @@ static void CreateSmallButtons(HWND hDlg)
if (i16 >= 28)
icon_offset = 20;
else if (i16 > 20)
else if (i16 >= 20)
icon_offset = 10;
buffer = GetResource(hMainInstance, MAKEINTRESOURCEA(IDI_SAVE_16 + icon_offset), _RT_RCDATA, "save icon", &bufsize, FALSE);
@ -1977,7 +1977,7 @@ static void CreateAdditionalControls(HWND hDlg)
s16 = 24;
if (i16 >= 28)
icon_offset = 20;
else if (i16 > 20)
else if (i16 >= 20)
icon_offset = 10;
// Fetch the up and down expand icons for the advanced options toolbar
@ -3445,7 +3445,10 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
case WM_DRAWITEM:
if (wParam == IDC_STATUS) {
pDI = (DRAWITEMSTRUCT*)lParam;
pDI->rcItem.top -= (int)((4.0f * fScale) - 6.0f);
if (nWindowsVersion >= WINDOWS_10)
pDI->rcItem.top += (int)(1.0f * fScale);
else if (fScale >= 1.49f)
pDI->rcItem.top -= (int)(1.5f * fScale);
pDI->rcItem.left += (int)(4.0f * fScale);
SetBkMode(pDI->hDC, TRANSPARENT);
switch (pDI->itemID) {

View File

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.0.1262"
CAPTION "Rufus 3.0.1263"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -389,8 +389,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,1262,0
PRODUCTVERSION 3,0,1262,0
FILEVERSION 3,0,1263,0
PRODUCTVERSION 3,0,1263,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -407,13 +407,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.0.1262"
VALUE "FileVersion", "3.0.1263"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.0.1262"
VALUE "ProductVersion", "3.0.1263"
END
END
BLOCK "VarFileInfo"