diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-13 17:32:08 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-13 17:32:08 +0300 |
| commit | 520fca8c13037c9077e7d372c0d20a2364964ffb (patch) | |
| tree | 9b8594a08387b2e31952e4ece4f92732b50ca38f /plugins/Clist_blind/src | |
| parent | d34d3314d9da310469343a0de2f4b3b49c3a56b9 (diff) | |
Contacts lists:
- duplicate IDR_CLISTMENU resources removed, the only copy remains in mir_app.dll;
- local variable g_hMenuMain removed from Clist_Modern and replaced with g_clistApi.hMenuMain;
- duplicate code removed from Clist_Modern (CLUI::CreateCluiFrames())
- fixes #1465 (StdClist: "Status" menu cannot change language on the fly);
- fixes #1467 (Clist_blind: menu cannot change language on the fly);
- fixes menu-related part in #1471
Diffstat (limited to 'plugins/Clist_blind/src')
| -rw-r--r-- | plugins/Clist_blind/src/cluiopts.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_blind/src/resource.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 1acb1998b0..a7ede404d9 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -201,10 +201,12 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L else
SetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE,
GetWindowLongPtr(g_clistApi.hwndContactList, GWL_STYLE) & ~(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX));
+
if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU))
SetMenu(g_clistApi.hwndContactList, nullptr);
else
SetMenu(g_clistApi.hwndContactList, g_clistApi.hMenuMain);
+
SetWindowPos(g_clistApi.hwndContactList, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
RedrawWindow(g_clistApi.hwndContactList, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE);
if (IsIconic(g_clistApi.hwndContactList) && BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TOOLWND))
diff --git a/plugins/Clist_blind/src/resource.h b/plugins/Clist_blind/src/resource.h index 5f07d6caf0..c5f4824b5d 100644 --- a/plugins/Clist_blind/src/resource.h +++ b/plugins/Clist_blind/src/resource.h @@ -5,7 +5,6 @@ #define IDD_OPT_CLIST 126
#define IDC_DROP 183
#define IDD_OPT_HOTKEY 184
-#define IDR_CLISTMENU 199
#define IDC_HYPERLINKHAND 214
#define IDC_DROPUSER 215
#define IDD_OPT_CLUI 218
|