summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_srmm_int.h2
-rw-r--r--plugins/TabSRMM/src/buttonsbar.cpp110
-rw-r--r--plugins/TabSRMM/src/msgs.h7
-rw-r--r--plugins/TabSRMM/src/stdafx.h2
4 files changed, 59 insertions, 62 deletions
diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index f52279445d..9fbfed7d24 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -59,7 +59,7 @@ struct CustomButtonData : public MZeroedObject
HANDLE m_hIcon; // Handle to icolib registred icon
bool m_bIMButton, m_bChatButton;
- bool m_bCanBeHidden, m_bCantBeHidden, m_bHidden, m_bAutoHidden, m_bSeparator, m_bDisabled, m_bPushButton;
+ bool m_bCanBeHidden, m_bCantBeHidden, m_bHidden, m_bSeparator, m_bDisabled, m_bPushButton;
bool m_bRSided;
BYTE m_opFlags;
HPLUGIN m_pPlugin;
diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index f04cec0b52..106fb2cd66 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -238,46 +238,40 @@ BOOL CMsgDialog::BB_SetButtonsPos()
CustomButtonData *cbd;
for (int i = 0; cbd = Srmm_GetNthButton(i); i++) {
- if (cbd->m_bRSided) // filter only left buttons
+ if (cbd->m_bRSided || !BB_IsDisplayed(cbd)) // filter only left & displayed buttons
continue;
- if ((!isChat() && cbd->m_bIMButton) || (isChat() && cbd->m_bChatButton)) {
- HWND hwndButton = GetDlgItem(m_hwnd, cbd->m_dwButtonCID);
-
- if (!showToolbar) {
- ShowWindow(hwndButton, SW_HIDE);
- if (nullptr != hwndButton) /* Wine fix. */
- hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, lwidth, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
- if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(cbd->m_bAutoHidden || cbd->m_bHidden)))
- lwidth += cbd->m_iButtonWidth + gap;
- if (!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton) && !cbd->m_bAutoHidden)
- cbd->m_bAutoHidden = true;
- continue;
- }
- if (!cbd->m_bCanBeHidden && !cbd->m_bHidden && !(!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton) && !cbd->m_bAutoHidden)) {
- ShowWindow(hwndButton, SW_SHOW);
- cbd->m_bAutoHidden = false;
- }
+ HWND hwndButton = GetDlgItem(m_hwnd, cbd->m_dwButtonCID);
+ if (hwndButton == nullptr)
+ continue;
+
+ bool bAutoHidden = mapHidden[cbd];
- if (!cbd->m_bSeparator && !IsWindowVisible(hwndButton) && !IsWindowEnabled(hwndButton) && !cbd->m_bAutoHidden)
+ if (showToolbar) {
+ if (!cbd->m_bSeparator && !IsWindowEnabled(hwndButton) && !bAutoHidden)
tempL -= cbd->m_iButtonWidth + gap;
- if (cbd->m_bCanBeHidden && !cbd->m_bHidden && (cbd->m_bSeparator || !((!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton)) && !cbd->m_bAutoHidden))) {
- if (tempL + tempR > (rect.right - foravatar)) {
- ShowWindow(hwndButton, SW_HIDE);
- cbd->m_bAutoHidden = true;
- tempL -= cbd->m_iButtonWidth + gap;
+ if (cbd->m_bCanBeHidden && !cbd->m_bHidden) {
+ if (!bAutoHidden) {
+ if (tempL + tempR > (rect.right - foravatar) && (cbd->m_bSeparator || IsWindowVisible(hwndButton))) {
+ ShowWindow(hwndButton, SW_HIDE);
+ bAutoHidden = true;
+ tempL -= cbd->m_iButtonWidth + gap;
+ }
}
- else if (cbd->m_bAutoHidden) {
+ else {
ShowWindow(hwndButton, SW_SHOW);
- cbd->m_bAutoHidden = false;
+ bAutoHidden = false;
}
}
- if (nullptr != hwndButton) /* Wine fix. */
- hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, lwidth, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);// SWP_NOCOPYBITS);
- if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(cbd->m_bAutoHidden || cbd->m_bHidden)))
- lwidth += cbd->m_iButtonWidth + gap;
}
+ else ShowWindow(hwndButton, SW_HIDE);
+
+ hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, lwidth, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+ if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(bAutoHidden || cbd->m_bHidden)))
+ lwidth += cbd->m_iButtonWidth + gap;
+
+ mapHidden[cbd] = bAutoHidden;
}
if (m_pContainer->m_flags.m_bSideBar && (m_pContainer->m_pSideBar->getFlags() & CSideBar::SIDEBARORIENTATION_RIGHT)) {
@@ -288,48 +282,42 @@ BOOL CMsgDialog::BB_SetButtonsPos()
}
for (int i = 0; cbd = Srmm_GetNthButton(i); i++) {
- if (!cbd->m_bRSided) // filter only right buttons
+ if (!cbd->m_bRSided || !BB_IsDisplayed(cbd)) // filter only right & displayed buttons
+ continue;
+
+ HWND hwndButton = GetDlgItem(m_hwnd, cbd->m_dwButtonCID);
+ if (hwndButton == nullptr)
continue;
- if ((!isChat() && cbd->m_bIMButton) || (isChat() && cbd->m_bChatButton)) {
- HWND hwndButton = GetDlgItem(m_hwnd, cbd->m_dwButtonCID);
-
- if (!showToolbar) {
- ShowWindow(hwndButton, SW_HIDE);
- if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(cbd->m_bAutoHidden || cbd->m_bHidden)))
- rwidth += cbd->m_iButtonWidth + gap;
- if (nullptr != hwndButton) /* Wine fix. */
- hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, rect.right - foravatar - rwidth + gap, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
- if (!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton) && !cbd->m_bAutoHidden)
- cbd->m_bAutoHidden = true;
- continue;
- }
- if (!cbd->m_bCanBeHidden && !cbd->m_bHidden && !((!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton)) && !cbd->m_bAutoHidden)) {
- ShowWindow(hwndButton, SW_SHOW);
- cbd->m_bAutoHidden = false;
- }
+ bool bAutoHidden = mapHidden[cbd];
- if (!cbd->m_bSeparator && !IsWindowVisible(hwndButton) && !IsWindowEnabled(hwndButton) && !cbd->m_bAutoHidden)
+ if (showToolbar) {
+ if (!cbd->m_bSeparator && !IsWindowVisible(hwndButton) && !IsWindowEnabled(hwndButton) && !bAutoHidden)
tempR -= cbd->m_iButtonWidth + gap;
- if (cbd->m_bCanBeHidden && !cbd->m_bHidden && (cbd->m_bSeparator || !((!IsWindowEnabled(hwndButton) && !IsWindowVisible(hwndButton)) && !cbd->m_bAutoHidden))) {
- if (tempL + tempR > (rect.right - foravatar)) {
- ShowWindow(hwndButton, SW_HIDE);
- cbd->m_bAutoHidden = true;
- tempR -= cbd->m_iButtonWidth + gap;
+ if (cbd->m_bCanBeHidden && !cbd->m_bHidden) {
+ if (!bAutoHidden) {
+ if (tempL + tempR > (rect.right - foravatar) && (cbd->m_bSeparator || IsWindowVisible(hwndButton))) {
+ ShowWindow(hwndButton, SW_HIDE);
+ bAutoHidden = true;
+ tempR -= cbd->m_iButtonWidth + gap;
+ }
}
- else if (cbd->m_bAutoHidden) {
+ else {
ShowWindow(hwndButton, SW_SHOW);
- cbd->m_bAutoHidden = false;
+ bAutoHidden = false;
}
}
-
- if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(cbd->m_bAutoHidden || cbd->m_bHidden)))
- rwidth += cbd->m_iButtonWidth + gap;
- if (nullptr != hwndButton) /* Wine fix. */
- hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, rect.right - foravatar - rwidth + gap, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
}
+ else ShowWindow(hwndButton, SW_HIDE);
+
+ if (IsWindowVisible(hwndButton) || (cbd->m_bSeparator && !(bAutoHidden || cbd->m_bHidden)))
+ rwidth += cbd->m_iButtonWidth + gap;
+ hdwp = DeferWindowPos(hdwp, hwndButton, nullptr, rect.right - foravatar - rwidth + gap, splitterY - iOff, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
+
+ mapHidden[cbd] = bAutoHidden;
}
+
return EndDeferWindowPos(hdwp);
}
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 07ddeb7e1f..a41f0ccd8d 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -353,6 +353,13 @@ class CMsgDialog : public CSrmmBaseDialog
BOOL BB_SetButtonsPos(void);
void BB_RedrawButtons(void);
+ std::map<CustomButtonData *, bool> mapHidden;
+
+ __forceinline bool BB_IsDisplayed(CustomButtonData *cbd) const
+ {
+ return (!isChat() && cbd->m_bIMButton) || (isChat() && cbd->m_bChatButton);
+ }
+
void CB_DestroyAllButtons(void);
void CB_DestroyButton(DWORD dwButtonCID, DWORD dwFlags);
void CB_ChangeButton(CustomButtonData *cbd);
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 8520aa40ec..35440301fa 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -45,6 +45,8 @@
#include <malloc.h>
#include <locale.h>
+#include <map>
+
#include <msapi/vsstyle.h>
#include <msapi/comptr.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 01:11:19 +0000