diff options
| author | George Hazan <ghazan@miranda.im> | 2020-04-20 15:37:45 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-04-20 15:37:45 +0300 |
| commit | c9c30e7f8c91d1cf6f6ce7b2178a03ad4faa5d20 (patch) | |
| tree | f5e779270f60918eb97bbafea24ac7318898a30a /src/core | |
| parent | d055638795e2d803ed016015f59e1824f840dd84 (diff) | |
fixes #2334 (Обрезается строка в русском переводе)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdfile/res/resource.rc | 2 | ||||
| -rw-r--r-- | src/core/stdfile/src/filexferdlg.cpp | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/core/stdfile/res/resource.rc b/src/core/stdfile/res/resource.rc index 870bf98c00..419246897c 100644 --- a/src/core/stdfile/res/resource.rc +++ b/src/core/stdfile/res/resource.rc @@ -92,7 +92,7 @@ BEGIN CONTROL "Transfer completed, open file(s).",IDC_TRANSFERCOMPLETED,
"Hyperlink",NOT WS_VISIBLE | WS_TABSTOP,42,17,173,10
LTEXT "No data transferred",IDC_ALLTRANSFERRED,25,29,230,14,SS_NOPREFIX | SS_CENTERIMAGE
- RTEXT "",IDC_ALLSPEED,25,29,226,14,SS_NOPREFIX | SS_CENTERIMAGE
+ RTEXT "",IDC_ALLSPEED,252,29,3,14,SS_NOPREFIX | SS_CENTERIMAGE
LTEXT "",IDC_ALLPRECENTS,218,14,33,14,SS_CENTERIMAGE
CONTROL "",IDC_FRAME,"Static",SS_ETCHEDHORZ,1,43,254,1
END
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index 3eae7a9a83..d969e68478 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -191,14 +191,17 @@ static void HideProgressControls(HWND hwndDlg) PostMessage(GetParent(hwndDlg), WM_FT_RESIZE, 0, (LPARAM)hwndDlg); } -static int FileTransferDlgResizer(HWND, LPARAM, UTILRESIZECONTROL *urc) +static int FileTransferDlgResizer(HWND, LPARAM param, UTILRESIZECONTROL *urc) { + auto *dat = (FileDlgData *)param; + switch (urc->wId) { case IDC_CONTACTNAME: case IDC_STATUS: case IDC_ALLFILESPROGRESS: case IDC_TRANSFERCOMPLETED: return RD_ANCHORX_WIDTH | RD_ANCHORY_TOP; + case IDC_FRAME: return RD_ANCHORX_WIDTH | RD_ANCHORY_BOTTOM; case IDC_ALLPRECENTS: @@ -208,13 +211,19 @@ static int FileTransferDlgResizer(HWND, LPARAM, UTILRESIZECONTROL *urc) return RD_ANCHORX_RIGHT | RD_ANCHORY_TOP; case IDC_ALLTRANSFERRED: + if (dat->waitingForAcceptance) + return RD_ANCHORX_WIDTH | RD_ANCHORY_TOP; + urc->rcItem.right = urc->rcItem.left + (urc->rcItem.right - urc->rcItem.left - urc->dlgOriginalSize.cx + urc->dlgNewSize.cx) / 3; - return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM; + return RD_ANCHORX_CUSTOM | RD_ANCHORY_TOP; case IDC_ALLSPEED: + if (dat->waitingForAcceptance) + return RD_ANCHORX_RIGHT | RD_ANCHORY_TOP; + urc->rcItem.right = urc->rcItem.right - urc->dlgOriginalSize.cx + urc->dlgNewSize.cx; urc->rcItem.left = urc->rcItem.left + (urc->rcItem.right - urc->rcItem.left) / 3; - return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM; + return RD_ANCHORX_CUSTOM | RD_ANCHORY_TOP; } return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; } @@ -290,7 +299,8 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SetDlgItemText(hwndDlg, IDC_CONTACTNAME, Clist_GetContactDisplayName(dat->hContact)); - if (!dat->waitingForAcceptance) SetTimer(hwndDlg, 1, 1000, nullptr); + if (!dat->waitingForAcceptance) + SetTimer(hwndDlg, 1, 1000, nullptr); return TRUE; case WM_TIMER: @@ -708,7 +718,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR break; case WM_SIZE: - Utils_ResizeDialog(hwndDlg, g_plugin.getInst(), MAKEINTRESOURCEA(IDD_FILETRANSFERINFO), FileTransferDlgResizer); + Utils_ResizeDialog(hwndDlg, g_plugin.getInst(), MAKEINTRESOURCEA(IDD_FILETRANSFERINFO), FileTransferDlgResizer, LPARAM(dat)); RedrawWindow(GetDlgItem(hwndDlg, IDC_ALLTRANSFERRED), NULL, NULL, RDW_INVALIDATE | RDW_NOERASE); RedrawWindow(GetDlgItem(hwndDlg, IDC_ALLSPEED), NULL, NULL, RDW_INVALIDATE | RDW_NOERASE); |