summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-11-01 16:18:54 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-11-01 16:18:54 +0300
commit04f37ad5c8b27e728ee933a3f00ba7db43fac7d9 (patch)
treed4eeb1b0e87879794deb8eafbceed334af0a8787
parentc1736131717176fb800a7bf45a6b5a4568e8f9af (diff)
bad anti-flicker code removed
-rw-r--r--include/m_gui.h2
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp2
-rw-r--r--src/mir_core/src/CSplitter.cpp10
3 files changed, 3 insertions, 11 deletions
diff --git a/include/m_gui.h b/include/m_gui.h
index 39504aa4e6..05e4021b3f 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -614,7 +614,7 @@ protected:
virtual LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
virtual void OnInit() override;
- int m_iPosition, m_iCount;
+ int m_iPosition;
};
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 0913a19ec6..77c69e8316 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -434,8 +434,6 @@ void CSrmmWindow::OnSplitterMoved(CSplitter *pSplitter)
GetWindowRect(m_message.GetHwnd(), &rc);
if (rc.bottom - rc.top + (m_splitterPos - oldSplitterY) < m_minEditBoxSize.cy)
m_splitterPos = oldSplitterY + m_minEditBoxSize.cy - (rc.bottom - rc.top);
- if (rcLog.bottom - rcLog.top - (m_splitterPos - oldSplitterY) < m_minEditBoxSize.cy)
- m_splitterPos = oldSplitterY - m_minEditBoxSize.cy + (rcLog.bottom - rcLog.top);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_core/src/CSplitter.cpp b/src/mir_core/src/CSplitter.cpp
index c229c3eb93..0fc0932e52 100644
--- a/src/mir_core/src/CSplitter.cpp
+++ b/src/mir_core/src/CSplitter.cpp
@@ -27,8 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
CSplitter::CSplitter(CDlgBase *wnd, int idCtrl)
: CCtrlBase(wnd, idCtrl),
- m_iPosition(0),
- m_iCount(0)
+ m_iPosition(0)
{
}
@@ -70,12 +69,7 @@ LRESULT CSplitter::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam)
}
OnChange(this);
-
- if (m_iCount == 3) {
- m_iCount = 0;
- PostMessage(m_parentWnd->GetHwnd(), WM_SIZE, 0, 0);
- }
- else m_iCount++;
+ PostMessage(m_parentWnd->GetHwnd(), WM_SIZE, 0, 0);
}
return 0;