diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-31 19:01:27 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-31 19:01:27 +0000 |
| commit | 3e5959daa64de93186b2dceaeaf0a85c0535a5c6 (patch) | |
| tree | 63b8714af89ef32951af2411e33b2b49520fdbbf /plugins/TabSRMM | |
| parent | 4b25736d4b3565e4e9945d191d15e0740dce6afc (diff) | |
fix for correct info panel closing
git-svn-id: http://svn.miranda-ng.org/main/trunk@10007 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/infopanel.cpp | 7 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/version.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index b7c5283134..294cd923ce 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -168,7 +168,7 @@ LRESULT TSAPI DM_GenericHotkeysCheck(MSG *message, TWindowData *dat) } break; case TABSRMM_HK_TOGGLEINFOPANEL: - dat->Panel->setActive(dat->Panel->isActive() ? FALSE : TRUE); + dat->Panel->setActive(!dat->Panel->isActive()); dat->Panel->showHide(); return 1; case TABSRMM_HK_EMOTICONS: diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index 1adf6eaf6f..c34d587500 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -174,7 +174,12 @@ void CInfoPanel::showHide() const HWND hwndDlg = m_dat->hwnd;
if (!m_isChat) {
- ::ShowWindow(m_dat->hwndPanelPicParent, (m_active && m_dat->hwndPanelPic) ? SW_SHOW : SW_HIDE);
+ ::ShowWindow(m_dat->hwndPanelPicParent, (m_active) ? SW_SHOW : SW_HIDE);
+
+ if (!m_active && m_dat->hwndPanelPic) {
+ ::DestroyWindow(m_dat->hwndPanelPic);
+ m_dat->hwndPanelPic = NULL;
+ }
m_dat->iRealAvatarHeight = 0;
::AdjustBottomAvatarDisplay(m_dat);
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h index 639209972d..7c93f17150 100644 --- a/plugins/TabSRMM/src/version.h +++ b/plugins/TabSRMM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 3
#define __MINOR_VERSION 4
#define __RELEASE_NUM 0
-#define __BUILD_NUM 1
+#define __BUILD_NUM 2
#include <stdver.h>
|