summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-05-16 19:34:54 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-05-16 19:34:54 +0300
commit53fc189d61515c86a9c62b02706bc432bf474ee0 (patch)
tree1c34b0a7e36bfc99bdf4d8656fdfee7be92fb19c
parent8e8a82025c80099b93d1eb94f4ecfab4f33971bb (diff)
to #2881 (#8: кнопку Close нужно убрать, т.к. рядом находится стандартный виндовый крестик в заголовке окна, который делает то же самое)
-rw-r--r--plugins/QuickSearch/res/resource.rc5
-rw-r--r--plugins/QuickSearch/src/window.cpp3
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;