Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/mergeresultwindow.cpp @ 92:4e6ebbbae925 0.9.95
KDiff3 0.9.95
| author | joachim99 |
|---|---|
| date | Tue, 03 Mar 2009 23:50:12 +0000 |
| parents | fa1a49fc1ec1 |
| children | 236f1c9c3fbf |
comparison
equal
deleted
inserted
replaced
| 91:fa1a49fc1ec1 | 92:4e6ebbbae925 |
|---|---|
| 2410 else | 2410 else |
| 2411 m_selection.reset(); | 2411 m_selection.reset(); |
| 2412 | 2412 |
| 2413 m_cursorYPos = y; | 2413 m_cursorYPos = y; |
| 2414 m_cursorXPos = xOnScreen; | 2414 m_cursorXPos = xOnScreen; |
| 2415 if ( m_cursorXPos>m_nofColumns ) | |
| 2416 { | |
| 2417 m_nofColumns = m_cursorXPos; | |
| 2418 emit resizeSignal(); | |
| 2419 } | |
| 2415 if ( ! bYMoveKey ) | 2420 if ( ! bYMoveKey ) |
| 2416 m_cursorOldXPos = m_cursorXPos; | 2421 m_cursorOldXPos = m_cursorXPos; |
| 2417 | 2422 |
| 2418 m_bCursorOn = false; | 2423 m_bCursorOn = false; |
| 2419 | 2424 |