• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28327 (tree)
Time2018-07-31 04:19:48
Authorstefankueng

Log Message

Merged revision(s) r28325, r28326 from trunk:
* Fix storing the splitter positions.
* Ignore minimizing/maximizing/restoring: the rectangles aren't valid in those situations.

Change Summary

Incremental Difference

--- branches/1.10.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28326)
+++ branches/1.10.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28327)
@@ -632,9 +632,9 @@
632632
633633 void CLogDlg::RestoreLogDlgWindowAndSplitters()
634634 {
635- DWORD yPos1 = CRegDWORD(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1" + m_bMonitoringMode ? L"M" : L"");
636- DWORD yPos2 = CRegDWORD(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2" + m_bMonitoringMode ? L"M" : L"");
637- DWORD xPos = CRegDWORD(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3" + m_bMonitoringMode ? L"M" : L"");
635+ DWORD yPos1 = CRegDWORD(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1");
636+ DWORD yPos2 = CRegDWORD(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2");
637+ DWORD xPos = CRegDWORD(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3");
638638 RECT rcDlg, rcLogList, rcChgMsg, rcProjTree;
639639 GetClientRect(&rcDlg);
640640 m_LogList.GetWindowRect(&rcLogList);
@@ -1338,9 +1338,9 @@
13381338 {
13391339 if (!IsIconic())
13401340 {
1341- CRegDWORD regPos1(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1" + m_bMonitoringMode ? L"M" : L"");
1342- CRegDWORD regPos2(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2" + m_bMonitoringMode ? L"M" : L"");
1343- CRegDWORD regPos3(L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3" + m_bMonitoringMode ? L"M" : L"");
1341+ CRegDWORD regPos1(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1");
1342+ CRegDWORD regPos2(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2");
1343+ CRegDWORD regPos3(m_bMonitoringMode ? L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3M" : L"Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer3");
13441344 RECT rectSplitter;
13451345 m_wndSplitter1.GetWindowRect(&rectSplitter);
13461346 ScreenToClient(&rectSplitter);
@@ -6315,7 +6315,7 @@
63156315 void CLogDlg::OnSize(UINT nType, int cx, int cy)
63166316 {
63176317 __super::OnSize(nType, cx, cy);
6318- if ((m_LogList) && (m_ChangedFileListCtrl))
6318+ if ((m_LogList) && (m_ChangedFileListCtrl) && (nType == 0) && (cx >0) && (cy > 0))
63196319 {
63206320 // correct the splitter positions if they're out of bounds
63216321 CRect rcTop;
Show on old repository browser