From 53fc189d61515c86a9c62b02706bc432bf474ee0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 May 2021 19:34:54 +0300 Subject: =?UTF-8?q?to=20#2881=20(#8:=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D1=83=20Close=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D1=83=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D1=8C,=20=D1=82.=D0=BA.=20=D1=80=D1=8F=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=BD=D0=B0=D1=85=D0=BE=D0=B4=D0=B8=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=B2=D0=B8=D0=BD=D0=B4=D0=BE=D0=B2=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=BA=D1=80=D0=B5=D1=81=D1=82=D0=B8=D0=BA=20=D0=B2=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B5=20=D0=BE=D0=BA?= =?UTF-8?q?=D0=BD=D0=B0,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=B5=D1=82=20=D1=82=D0=BE=20=D0=B6?= =?UTF-8?q?=D0=B5=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/QuickSearch/res/resource.rc | 5 ++--- plugins/QuickSearch/src/window.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/QuickSearch/res/resource.rc b/plugins/QuickSearch/res/resource.rc index e1de82739e..149d082c46 100644 --- a/plugins/QuickSearch/res/resource.rc +++ b/plugins/QuickSearch/res/resource.rc @@ -77,9 +77,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE | EXSTYLE WS_EX_CONTROLPARENT FONT 8, "Ms Shell Dlg", 0, 0, 0x1 BEGIN - EDITTEXT IDC_E_SEARCHTEXT,180,8,276,14 - PUSHBUTTON "Close",IDCANCEL,462,0,52,14 - PUSHBUTTON "Refresh",IDC_REFRESH,462,16,52,14 + EDITTEXT IDC_E_SEARCHTEXT,180,8,276,12 + PUSHBUTTON "Refresh",IDC_REFRESH,462,8,52,12 CONTROL "Show Offline contacts",IDC_CH_SHOWOFFLINE,"Button",BS_AUTOCHECKBOX | BS_VCENTER | BS_MULTILINE | BS_FLAT | WS_TABSTOP,2,0,96,20 CONTROL "Colorize",IDC_CH_COLORIZE,"Button",BS_AUTOCHECKBOX | BS_VCENTER | BS_MULTILINE | BS_FLAT | WS_TABSTOP,2,20,96,10 COMBOBOX IDC_CB_PROTOCOLS,100,8,76,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP diff --git a/plugins/QuickSearch/src/window.cpp b/plugins/QuickSearch/src/window.cpp index f7777c637a..14c39f87c4 100644 --- a/plugins/QuickSearch/src/window.cpp +++ b/plugins/QuickSearch/src/window.cpp @@ -56,7 +56,7 @@ INT_PTR QSMainDlg::NewEditProc(UINT msg, WPARAM wParam, LPARAM) switch (msg) { case WM_CHAR: if (wParam == 27) // Escape - PostMessage(m_hwnd, WM_COMMAND, IDCANCEL, 0); + Close(); break; case WM_KEYUP: @@ -515,7 +515,6 @@ void QSMainDlg::OnDestroy() int QSMainDlg::Resizer(UTILRESIZECONTROL *urc) { switch (urc->wId) { - case IDCANCEL: case IDC_REFRESH: return RD_ANCHORX_RIGHT | RD_ANCHORY_TOP; -- cgit v1.2.3