Skip to content

Commit 50d1cd4

Browse files
committed
Add lines to selected range in merge window
1 parent 19b437e commit 50d1cd4

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

kdiff3/src-QT4/mergeresultwindow.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,6 +1853,20 @@ void MergeResultWindow::writeLine(
18531853
p.drawLine( xOffset+2, yOffset, xOffset+2, yOffset+fontHeight-1 );
18541854
p.drawLine( xOffset+3, yOffset, xOffset+3, yOffset+fontHeight-1 );*/
18551855
}
1856+
1857+
if (( rangeMark & 4 ) && ( rangeMark & 1))
1858+
{
1859+
//put a line at top and bottom of the current selected range
1860+
p.setPen( QPen( Qt::blue, 1, Qt::DashLine) );
1861+
p.drawLine( xOffset + 2, yOffset, p.window().width(), yOffset );
1862+
}
1863+
1864+
if (( rangeMark & 4 ) && ( rangeMark & 2))
1865+
{
1866+
//put a line at top and bottom of the current selected range
1867+
p.setPen( QPen( Qt::blue, 1, Qt::DashLine) );
1868+
p.drawLine( xOffset + 2, yOffset + fontHeight, p.window().width(), yOffset + fontHeight );
1869+
}
18561870
}
18571871

18581872
void MergeResultWindow::setPaintingAllowed(bool bPaintingAllowed)

0 commit comments

Comments
 (0)