• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28667 (tree)
Time2019-10-04 01:45:20
Authorstefankueng

Log Message

Use Ctrl+M to toggle the "Mark/Unmark this change".

Change Summary

Incremental Difference

--- trunk/src/TortoiseMerge/BaseView.cpp (revision 28666)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 28667)
@@ -3200,6 +3200,17 @@
32003200 m_bInsertMode = !m_bInsertMode;
32013201 UpdateCaret();
32023202 break;
3203+ case 'M':
3204+ if (bControl && m_pwndRight)
3205+ {
3206+ int nFirstViewLine = 0;
3207+ int nLastViewLine = 0;
3208+ if (GetViewSelection(nFirstViewLine, nLastViewLine))
3209+ {
3210+ m_pwndRight->MarkBlock(!m_pwndRight->GetViewMarked(nFirstViewLine));
3211+ }
3212+ }
3213+ break;
32033214
32043215 }
32053216 CView::OnKeyDown(nChar, nRepCnt, nFlags);
@@ -3827,8 +3838,12 @@
38273838 CView::OnChar(nChar, nRepCnt, nFlags);
38283839
38293840 bool bShift = !!(GetKeyState(VK_SHIFT)&0x8000);
3841+ bool bControl = !!(GetKeyState(VK_CONTROL)&0x8000);
38303842 bool bSkipSelectionClear = false;
38313843
3844+ if (bControl)
3845+ return;
3846+
38323847 if (IsReadonly())
38333848 return;
38343849
Show on old repository browser