mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[ui] resize SelectionDialog() according to the text content
This commit is contained in:
parent
01dbb3d957
commit
8790c480dd
2 changed files with 26 additions and 12 deletions
10
src/rufus.rc
10
src/rufus.rc
|
@ -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.20.1923"
|
CAPTION "Rufus 3.20.1924"
|
||||||
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
|
||||||
|
@ -395,8 +395,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 3,20,1923,0
|
FILEVERSION 3,20,1924,0
|
||||||
PRODUCTVERSION 3,20,1923,0
|
PRODUCTVERSION 3,20,1924,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -414,13 +414,13 @@ BEGIN
|
||||||
VALUE "Comments", "https://rufus.ie"
|
VALUE "Comments", "https://rufus.ie"
|
||||||
VALUE "CompanyName", "Akeo Consulting"
|
VALUE "CompanyName", "Akeo Consulting"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "3.20.1923"
|
VALUE "FileVersion", "3.20.1924"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||||
VALUE "OriginalFilename", "rufus-3.20.exe"
|
VALUE "OriginalFilename", "rufus-3.20.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "3.20.1923"
|
VALUE "ProductVersion", "3.20.1924"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
28
src/stdlg.c
28
src/stdlg.c
|
@ -868,7 +868,7 @@ static int selection_dialog_style, selection_dialog_mask;
|
||||||
INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
LRESULT loc;
|
LRESULT loc;
|
||||||
int i, m, dh, r = -1;
|
int i, m, dw, dh, r = -1, mw;
|
||||||
// Prevent resizing
|
// Prevent resizing
|
||||||
static LRESULT disabled[9] = { HTLEFT, HTRIGHT, HTTOP, HTBOTTOM, HTSIZE,
|
static LRESULT disabled[9] = { HTLEFT, HTRIGHT, HTTOP, HTBOTTOM, HTSIZE,
|
||||||
HTTOPLEFT, HTTOPRIGHT, HTBOTTOMLEFT, HTBOTTOMRIGHT };
|
HTTOPLEFT, HTTOPRIGHT, HTBOTTOMLEFT, HTBOTTOMRIGHT };
|
||||||
|
@ -908,6 +908,13 @@ INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam, LPARA
|
||||||
separator_brush = CreateSolidBrush(GetSysColor(COLOR_3DLIGHT));
|
separator_brush = CreateSolidBrush(GetSysColor(COLOR_3DLIGHT));
|
||||||
SetTitleBarIcon(hDlg);
|
SetTitleBarIcon(hDlg);
|
||||||
CenterDialog(hDlg, NULL);
|
CenterDialog(hDlg, NULL);
|
||||||
|
|
||||||
|
// Get the dialog's default size
|
||||||
|
GetWindowRect(GetDlgItem(hDlg, IDC_SELECTION_TEXT), &rc);
|
||||||
|
MapWindowPoints(NULL, hDlg, (POINT*)&rc, 2);
|
||||||
|
mw = rc.right - rc.left - ddw; // ddw seems to work okay as a fudge
|
||||||
|
dw = mw;
|
||||||
|
|
||||||
// Change the default icon and set the text
|
// Change the default icon and set the text
|
||||||
Static_SetIcon(GetDlgItem(hDlg, IDC_SELECTION_ICON), LoadIcon(NULL, IDI_QUESTION));
|
Static_SetIcon(GetDlgItem(hDlg, IDC_SELECTION_ICON), LoadIcon(NULL, IDI_QUESTION));
|
||||||
SetWindowTextU(hDlg, szMessageTitle);
|
SetWindowTextU(hDlg, szMessageTitle);
|
||||||
|
@ -916,9 +923,14 @@ INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam, LPARA
|
||||||
for (i = 0; i < nDialogItems; i++) {
|
for (i = 0; i < nDialogItems; i++) {
|
||||||
SetWindowTextU(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), szDialogItem[i]);
|
SetWindowTextU(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), szDialogItem[i]);
|
||||||
ShowWindow(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), SW_SHOW);
|
ShowWindow(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), SW_SHOW);
|
||||||
|
// Compute the maximum line's width
|
||||||
|
mw = max(mw, GetTextSize(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), szDialogItem[i]).cx);
|
||||||
}
|
}
|
||||||
|
// If our maximum line's width is greater than the default, set a nonzero delta width
|
||||||
|
dw = (mw <= dw) ? 0: mw - dw;
|
||||||
// Move/Resize the controls as needed to fit our text
|
// Move/Resize the controls as needed to fit our text
|
||||||
hCtrl = GetDlgItem(hDlg, IDC_SELECTION_TEXT);
|
hCtrl = GetDlgItem(hDlg, IDC_SELECTION_TEXT);
|
||||||
|
ResizeMoveCtrl(hDlg, hCtrl, 0, 0, dw, 0, 1.0f);
|
||||||
hDC = GetDC(hCtrl);
|
hDC = GetDC(hCtrl);
|
||||||
SelectFont(hDC, hDlgFont); // Yes, you *MUST* reapply the font to the DC, even after SetWindowText!
|
SelectFont(hDC, hDlgFont); // Yes, you *MUST* reapply the font to the DC, even after SetWindowText!
|
||||||
GetWindowRect(hCtrl, &rc);
|
GetWindowRect(hCtrl, &rc);
|
||||||
|
@ -928,17 +940,19 @@ INT_PTR CALLBACK SelectionCallback(HWND hDlg, UINT message, WPARAM wParam, LPARA
|
||||||
safe_release_dc(hCtrl, hDC);
|
safe_release_dc(hCtrl, hDC);
|
||||||
ResizeMoveCtrl(hDlg, hCtrl, 0, 0, 0, dh, 1.0f);
|
ResizeMoveCtrl(hDlg, hCtrl, 0, 0, 0, dh, 1.0f);
|
||||||
for (i = 0; i < nDialogItems; i++)
|
for (i = 0; i < nDialogItems; i++)
|
||||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), 0, dh, 0, 0, 1.0f);
|
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + i), 0, dh, dw, 0, 1.0f);
|
||||||
if (nDialogItems > 2) {
|
if (nDialogItems > 2) {
|
||||||
GetWindowRect(GetDlgItem(hDlg, IDC_SELECTION_CHOICE2), &rc);
|
GetWindowRect(GetDlgItem(hDlg, IDC_SELECTION_CHOICE2), &rc);
|
||||||
GetWindowRect(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + nDialogItems - 1), &rc2);
|
GetWindowRect(GetDlgItem(hDlg, IDC_SELECTION_CHOICE1 + nDialogItems - 1), &rc2);
|
||||||
dh += rc2.top - rc.top;
|
dh += rc2.top - rc.top;
|
||||||
}
|
}
|
||||||
ResizeMoveCtrl(hDlg, hDlg, 0, 0, 0, dh, 1.0f);
|
if (dw != 0)
|
||||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, -1), 0, 0, 0, dh, 1.0f); // IDC_STATIC = -1
|
dw += ddw;
|
||||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_SELECTION_LINE), 0, dh, 0, 0, 1.0f);
|
ResizeMoveCtrl(hDlg, hDlg, 0, 0, dw, dh, 1.0f);
|
||||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDOK), 0, dh, 0, 0, 1.0f);
|
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, -1), 0, 0, dw, dh, 1.0f); // IDC_STATIC = -1
|
||||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDCANCEL), 0, dh, 0, 0, 1.0f);
|
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_SELECTION_LINE), 0, dh, dw, 0, 1.0f);
|
||||||
|
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDOK), dw, dh, 0, 0, 1.0f);
|
||||||
|
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDCANCEL), dw, dh, 0, 0, 1.0f);
|
||||||
ResizeButtonHeight(hDlg, IDOK);
|
ResizeButtonHeight(hDlg, IDOK);
|
||||||
ResizeButtonHeight(hDlg, IDCANCEL);
|
ResizeButtonHeight(hDlg, IDCANCEL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue