Skip to content

GitLab

Commit de8f67d9 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

Fix right to left languages. 


Signed-off-by: default avatarjoachim99 <joachim.eibl@gmx.de>
parent 6f7e6c07
Hide whitespace changes
Inline Side-by-side
kdiff3/src-QT4/difftextwindow.cpp
View file @ de8f67d9
......@@ -293,7 +293,7 @@ void DiffTextWindow::setHorizScrollOffset(int horizScrollOffset)
if ( d->m_pOptions->m_bRightToLeftLanguage )
{
deltaX = -deltaX;
r = QRect( width()-1-xOffset, 0, -(width()-xOffset), height() ).normalized();
r = QRect( width()-xOffset-2, 0, -(width()-xOffset), height() ).normalized();
}
if ( d->m_bSelectionInProgress && d->m_selection.firstLine != -1 )
......@@ -433,7 +433,8 @@ void DiffTextWindow::mousePressEvent ( QMouseEvent* e )
int fontWidth = fontMetrics().width('0');
int xOffset = d->leftInfoWidth() * fontWidth;
if ( e->x() < xOffset )
if ( (! d->m_pOptions->m_bRightToLeftLanguage && e->x() < xOffset )
|| ( d->m_pOptions->m_bRightToLeftLanguage && e->x() > width() - xOffset ) )
{
emit setFastSelectorLine( convertLineToDiff3LineIdx(line) );
d->m_selection.firstLine = -1; // Disable current d->m_selection
......@@ -630,7 +631,7 @@ void DiffTextWindow::timerEvent(QTimerEvent*)
if ( y1<height() && y2>0 )
{
QRect invalidRect = QRect( 0, y1-1, width(), y2-y1+2 );
QRect invalidRect = QRect( 0, y1-1, width(), y2-y1+fontHeight); // Some characters in exotic exceed the regular bottom.
update( invalidRect );
}
}
......@@ -657,23 +658,16 @@ void DiffTextWindow::convertToLinePos( int x, int y, int& line, int& pos )
{
const QFontMetrics& fm = fontMetrics();
int fontHeight = fm.lineSpacing();
int fontWidth = fm.width('0');
int xOffset = d->leftInfoWidth() * fontWidth - d->m_horizScrollOffset;
int yOffset = - d->m_firstLine * fontHeight;
line = ( y - yOffset ) / fontHeight;
if ( line >= 0 )
{
if ( ! d->m_pOptions->m_bRightToLeftLanguage )
{
QString s = d->getLineString( line );
QTextLayout textLayout( s, font(), this );
d->prepareTextLayout( textLayout, !d->m_pOptions->m_bWordWrap || d->m_diff3WrapLineVector[line].wrapLineOffset==0 );
pos = textLayout.lineAt(0).xToCursor(x-xOffset);
}
else
pos = ( (width() - 1 - x) - xOffset ) / fontWidth;
QString s = d->getLineString( line );
QTextLayout textLayout( s, font(), this );
d->prepareTextLayout( textLayout, !d->m_pOptions->m_bWordWrap || d->m_diff3WrapLineVector[line].wrapLineOffset==0 );
pos = textLayout.lineAt(0).xToCursor( x - textLayout.position().x() );
}
else
pos = -1;
......@@ -803,6 +797,8 @@ void DiffTextWindowData::prepareTextLayout( QTextLayout& textLayout, bool bFirst
textOption.setTabStop( m_pDiffTextWindow->fontMetrics().width(' ') * m_pOptions->m_tabSize );
if ( m_pOptions->m_bShowWhiteSpaceCharacters )
textOption.setFlags( QTextOption::ShowTabsAndSpaces );
if ( m_pOptions->m_bRightToLeftLanguage )
textOption.setAlignment(Qt::AlignRight); // only relevant for multi line text layout
textLayout.setTextOption( textOption );
if ( m_pOptions->m_bShowWhiteSpaceCharacters )
......@@ -821,6 +817,13 @@ void DiffTextWindowData::prepareTextLayout( QTextLayout& textLayout, bool bFirst
int leading = m_pDiffTextWindow->fontMetrics().leading();
int height = 0;
int fontWidth = m_pDiffTextWindow->fontMetrics().width('0');
int xOffset = leftInfoWidth() * fontWidth - m_horizScrollOffset;
int textWidth = visibleTextWidth;
if ( textWidth<0 )
textWidth = m_pDiffTextWindow->width() - xOffset;
int indentation = 0;
while (1)
{
......@@ -840,12 +843,17 @@ void DiffTextWindowData::prepareTextLayout( QTextLayout& textLayout, bool bFirst
}
else // only one line
{
line.setPosition(QPointF(indentation, height));
line.setPosition( QPointF(indentation, height));
break;
}
}
textLayout.endLayout();
if ( m_pOptions->m_bRightToLeftLanguage )
textLayout.setPosition( QPointF( textWidth - textLayout.maximumWidth(),0) );
else
textLayout.setPosition( QPointF( xOffset,0) );
}
void DiffTextWindowData::writeLine(
......@@ -988,7 +996,7 @@ void DiffTextWindowData::writeLine(
QTextLayout textLayout( lineString.mid( wrapLineOffset, lineLength), m_pDiffTextWindow->font(), m_pDiffTextWindow );
prepareTextLayout( textLayout, !m_bWordWrap || wrapLineOffset==0 );
textLayout.draw ( &p, QPoint(xOffset, yOffset), frh.m_formatRanges /*, const QRectF & clip = QRectF() */);
textLayout.draw ( &p, QPoint(0, yOffset), frh.m_formatRanges /*, const QRectF & clip = QRectF() */);
}
p.fillRect( 0, yOffset, leftInfoWidth()*fontWidth, fontHeight, m_pOptions->m_bgColor );
......
kdiff3/src-QT4/kdiff3.h
View file @ de8f67d9
......@@ -83,6 +83,10 @@ public slots:
else
QScrollBar::setValue( i );
}
int value() const
{
return m_realVal;
}
signals:
void valueChanged2(int);
};
......
kdiff3/src-QT4/mergeresultwindow.cpp
View file @ de8f67d9
......@@ -562,7 +562,7 @@ int MergeResultWindow::getNofLines()
int MergeResultWindow::getVisibleTextAreaWidth()
{
QFontMetrics fm = fontMetrics();
return width() - 4 * fm.width('0');
return width() - getTextXOffset();
}
int MergeResultWindow::getNofVisibleLines()
......@@ -1710,6 +1710,11 @@ QVector<QTextLayout::FormatRange> MergeResultWindow::getTextLayoutForLine(int li
QTextLine textLine = textLayout.createLine();
textLine.setPosition(QPointF(0, fontMetrics().leading()));
textLayout.endLayout();
int cursorWidth = 5;
if ( m_pOptions->m_bRightToLeftLanguage )
textLayout.setPosition( QPointF(width()-textLayout.maximumWidth()-getTextXOffset()+m_horizScrollOffset-cursorWidth, 0) );
else
textLayout.setPosition( QPointF(getTextXOffset() - m_horizScrollOffset, 0) );
return selectionFormat;
}
......@@ -1744,7 +1749,10 @@ void MergeResultWindow::writeLine(
if( (srcSelect > 0 || bUserModified ) && !bLineRemoved )
{
p.setClipRect( QRectF(xOffset,0,width()-xOffset,height()) );
if ( ! m_pOptions->m_bRightToLeftLanguage )
p.setClipRect( QRectF(xOffset,0,width()-xOffset,height()) );
else
p.setClipRect( QRectF(0,0,width()-xOffset,height()) );
int outPos = 0;
QString s;
......@@ -1769,11 +1777,13 @@ void MergeResultWindow::writeLine(
QTextLayout textLayout( str, font(), this );
QVector<QTextLayout::FormatRange> selectionFormat = getTextLayoutForLine( line, str, textLayout );
textLayout.draw( &p, QPointF(xOffset - m_horizScrollOffset, yOffset), selectionFormat );
textLayout.draw( &p, QPointF(0, yOffset), selectionFormat );
if ( line == m_cursorYPos )
{
m_cursorXPixelPos = textLayout.lineAt(0).cursorToX( m_cursorXPos );
if ( m_pOptions->m_bRightToLeftLanguage )
m_cursorXPixelPos += textLayout.position().x() - m_horizScrollOffset;
}
p.setClipping( false );
......@@ -1850,9 +1860,7 @@ void MergeResultWindow::paintEvent( QPaintEvent* )
bool bOldSelectionContainsData = m_selection.bSelectionContainsData;
const QFontMetrics& fm = fontMetrics();
int fontHeight = fm.lineSpacing();
int fontWidth = fm.width('0');
int fontAscent = fm.ascent();
if ( !m_bCursorUpdate ) // Don't redraw everything for blinking cursor?
{
......@@ -1928,19 +1936,14 @@ void MergeResultWindow::paintEvent( QPaintEvent* )
if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine )
{
MyPainter painter(this, m_pOptions->m_bRightToLeftLanguage, width(), fontWidth);
int topLineYOffset = 0;
int xOffset = getTextXOffset();
int yOffset = ( m_cursorYPos-m_firstLine ) * fontHeight + topLineYOffset;
int xCursor = m_cursorXPixelPos - m_horizScrollOffset + xOffset;
QPainter painter(this);
painter.setPen( m_pOptions->m_fgColor );
painter.drawLine( xCursor, yOffset, xCursor, yOffset+fontAscent );
painter.drawLine( xCursor-2, yOffset, xCursor+2, yOffset );
painter.drawLine( xCursor-2, yOffset+fontAscent+1, xCursor+2, yOffset+fontAscent+1 );
QString str = getString(m_cursorYPos);
QTextLayout textLayout( str, font(), this );
getTextLayoutForLine( m_cursorYPos, str, textLayout );
textLayout.drawCursor( &painter, QPointF(0, (m_cursorYPos-m_firstLine)*fontMetrics().lineSpacing()), m_cursorXPos );
}
if( !bOldSelectionContainsData && m_selection.bSelectionContainsData )
......@@ -2011,7 +2014,7 @@ void MergeResultWindow::mousePressEvent ( QMouseEvent* e )
QString s = getString(line);
QTextLayout textLayout( s, font(), this );
getTextLayoutForLine( line, s, textLayout );
int pos = textLayout.lineAt(0).xToCursor( e->x() - xOffset - m_horizScrollOffset );
int pos = textLayout.lineAt(0).xToCursor( e->x() - textLayout.position().x() );
bool bLMB = e->button() == Qt::LeftButton;
bool bMMB = e->button() == Qt::MidButton;
......@@ -2062,6 +2065,8 @@ void MergeResultWindow::mousePressEvent ( QMouseEvent* e )
}
m_cursorXPos = pos;
m_cursorXPixelPos = textLayout.lineAt(0).cursorToX( pos );
if ( m_pOptions->m_bRightToLeftLanguage )
m_cursorXPixelPos += textLayout.position().x() - m_horizScrollOffset;
m_cursorOldXPixelPos = m_cursorXPixelPos;
m_cursorYPos = line;
......@@ -2090,7 +2095,7 @@ void MergeResultWindow::mouseDoubleClickEvent( QMouseEvent* e )
QString s = getString(line);
QTextLayout textLayout( s, font(), this );
getTextLayoutForLine( line, s, textLayout );
int pos = textLayout.lineAt(0).xToCursor( e->x() - getTextXOffset() - m_horizScrollOffset );
int pos = textLayout.lineAt(0).xToCursor( e->x() - textLayout.position().x() );
m_cursorXPos = pos;
m_cursorOldXPixelPos = m_cursorXPixelPos;
m_cursorYPos = line;
......@@ -2134,7 +2139,7 @@ void MergeResultWindow::mouseMoveEvent ( QMouseEvent * e )
QString s = getString(line);
QTextLayout textLayout( s, font(), this );
getTextLayoutForLine( line, s, textLayout );
int pos = textLayout.lineAt(0).xToCursor( e->x() - getTextXOffset() - m_horizScrollOffset );
int pos = textLayout.lineAt(0).xToCursor( e->x() - textLayout.position().x() );
m_cursorXPos = pos;
m_cursorOldXPixelPos = m_cursorXPixelPos;
m_cursorYPos = line;
......@@ -2184,15 +2189,9 @@ void MergeResultWindow::slotCursorUpdate()
const QFontMetrics& fm = fontMetrics();
int topLineYOffset = 0;
//int xOffset = getTextXOffset();
int yOffset = ( m_cursorYPos - m_firstLine ) * fm.lineSpacing() + topLineYOffset;
//int xCursor = ( m_cursorXPos - m_firstColumn ) * fontWidth + xOffset;
//if (!m_pOptions->m_bRightToLeftLanguage)
// repaint( xCursor-2, yOffset, 5, fm.ascent()+2 );
//else
repaint( 0, yOffset, width(), fm.ascent()+2 );
//repaint( width()-1-4-(xCursor-2), yOffset, 5, fm.ascent()+2 );
repaint( 0, yOffset, width(), fm.lineSpacing()+2 );
m_bCursorUpdate=false;
}
......@@ -2379,7 +2378,7 @@ void MergeResultWindow::keyPressEvent( QKeyEvent* e )
case Qt::Key_Left:
case Qt::Key_Right:
if ( (e->key()==Qt::Key_Left) ^ m_pOptions->m_bRightToLeftLanguage ) // operator^: XOR
if ( e->key()==Qt::Key_Left )
{
if ( !bCtrl )
{
......@@ -2492,14 +2491,24 @@ void MergeResultWindow::keyPressEvent( QKeyEvent* e )
// try to preserve cursor x pixel position when moving to another line
if (bYMoveKey)
{
x = textLayout.lineAt(0).xToCursor( m_cursorOldXPixelPos );
if ( m_pOptions->m_bRightToLeftLanguage )
x = textLayout.lineAt(0).xToCursor( m_cursorOldXPixelPos - (textLayout.position().x() - m_horizScrollOffset));
else
x = textLayout.lineAt(0).xToCursor( m_cursorOldXPixelPos );
}
m_cursorXPixelPos = textLayout.lineAt(0).cursorToX( x );
if ( m_cursorXPixelPos < m_horizScrollOffset )
newHorizScrollOffset = m_cursorXPixelPos;
else if ( m_cursorXPixelPos > m_horizScrollOffset + width() - getTextXOffset() - fontMetrics().width('0') )
newHorizScrollOffset = m_cursorXPixelPos - (width() - getTextXOffset() - fontMetrics().width('0') );
int hF = 1; // horizontal factor
if ( m_pOptions->m_bRightToLeftLanguage )
{
m_cursorXPixelPos += textLayout.position().x() - m_horizScrollOffset;
hF=-1;
}
int cursorWidth = 5;
if ( m_cursorXPixelPos < hF * m_horizScrollOffset )
newHorizScrollOffset = hF * m_cursorXPixelPos;
else if ( m_cursorXPixelPos > hF * m_horizScrollOffset + getVisibleTextAreaWidth() - cursorWidth )
newHorizScrollOffset = hF * (m_cursorXPixelPos - (getVisibleTextAreaWidth() - cursorWidth ));
int newCursorX = x;
if ( bShift )
......@@ -2524,17 +2533,15 @@ void MergeResultWindow::keyPressEvent( QKeyEvent* e )
if ( ! bYMoveKey )
m_cursorOldXPixelPos = m_cursorXPixelPos;
m_bCursorOn = false;
m_bCursorOn = true;
m_cursorTimer.start(500);
update();
if ( newFirstLine!=m_firstLine || newHorizScrollOffset!=m_horizScrollOffset )
{
m_bCursorOn = true;
scroll( newHorizScrollOffset-m_horizScrollOffset, newFirstLine-m_firstLine );
return;
}
m_bCursorOn = true;
update();
}
void MergeResultWindow::calcIteratorFromLineNr(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment