diff options
author | George Hazan <george.hazan@gmail.com> | 2023-12-24 13:09:35 +0300 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2023-12-24 13:09:35 +0300 |
commit | fe8b2b1d75c273a38d052675685d1bbe1bd18515 (patch) | |
tree | d2daa28460002bc53ac806ae5df801a8254db15e | |
parent | ebacc2825d5beb3c3fe4d7ce8acd9290989415ae (diff) |
code cleaning
-rw-r--r-- | src/core/stdmsg/src/chat_manager.cpp | 5 | ||||
-rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 7 | ||||
-rw-r--r-- | src/core/stdmsg/src/stdafx.h | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp index f7c693b01a..be6f4a340a 100644 --- a/src/core/stdmsg/src/chat_manager.cpp +++ b/src/core/stdmsg/src/chat_manager.cpp @@ -103,10 +103,6 @@ static void OnLoadSettings() g_Settings.iSplitterX = db_get_w(0, CHAT_MODULE, "SplitterX", 105);
if (g_Settings.iSplitterX <= 50)
g_Settings.iSplitterX = 105;
-
- g_Settings.iSplitterY = db_get_w(0, CHAT_MODULE, "SplitterY", 90);
- if (g_Settings.iSplitterY <= 65)
- g_Settings.iSplitterY = 90;
}
static void RegisterFonts()
@@ -213,7 +209,6 @@ void Load_ChatModule() void Unload_ChatModule()
{
db_set_w(0, CHAT_MODULE, "SplitterX", (uint16_t)g_Settings.iSplitterX);
- db_set_w(0, CHAT_MODULE, "SplitterY", (uint16_t)g_Settings.iSplitterY);
DestroyMenu(g_hMenu);
}
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index eee20e3e00..4c13ced6be 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -56,9 +56,6 @@ CMsgDialog::CMsgDialog(CTabbedWindow *pOwner, SESSION_INFO *si) : m_pOwner(pOwner)
{
m_iSplitterX = g_Settings.iSplitterX;
- m_iSplitterY = g_Settings.iSplitterY;
-
- m_btnOk.OnClick = Callback(this, &CMsgDialog::onClick_Ok);
m_btnFilter.OnClick = Callback(this, &CMsgDialog::onClick_Filter);
m_btnNickList.OnClick = Callback(this, &CMsgDialog::onClick_NickList);
@@ -1223,7 +1220,6 @@ void CMsgDialog::onSplitterY(CSplitter *pSplitter) m_iSplitterY = min;
if (m_iSplitterY > rc.bottom - rc.top - toplimit)
m_iSplitterY = rc.bottom - rc.top - toplimit;
- g_Settings.iSplitterY = m_iSplitterY;
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1483,9 +1479,8 @@ void CMsgDialog::UpdateAvatar() if (m_avatarPic && m_minEditBoxSize.cy <= m_avatarHeight) {
m_minEditBoxSize.cy = m_avatarHeight;
- if (m_iSplitterY < m_minEditBoxSize.cy + m_iBBarHeight) {
+ if (m_iSplitterY < m_minEditBoxSize.cy + m_iBBarHeight)
m_iSplitterY = m_minEditBoxSize.cy + m_iBBarHeight;
- }
}
Resize();
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index 5f2f400c7f..a9a604d4aa 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -146,7 +146,7 @@ struct MODULEINFO : public GCModuleInfoBase {}; struct GlobalLogSettings : public GlobalLogSettingsBase
{
- int iSplitterX, iSplitterY;
+ int iSplitterX;
bool bTabsEnable, bTabsAtBottom, bTabCloseOnDblClick;
};
|