feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

UnifiedDiffEditor: Fix visible wrap column

Browse Source 
Take m_visibleIndentOffset into account when drawing
right margin.

Fixes: QTCREATORBUG-26601
Change-Id: I50839098953181c667a5fe0e5fac7dfa5bc95327
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2022-10-21 13:32:04 +02:00
parent 925a8a7a19
commit edd16c7047
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -4110,7 +4110,7 @@ void TextEditorWidgetPrivate::paintRightMarginArea(PaintEventData &data, QPainte
// Don't use QFontMetricsF::averageCharWidth here, due to it returning // Don't use QFontMetricsF::averageCharWidth here, due to it returning
// a fractional size even when this is not supported by the platform. // a fractional size even when this is not supported by the platform.
data.rightMargin = QFontMetricsF(q->font()).horizontalAdvance(QLatin1Char('x')) data.rightMargin = QFontMetricsF(q->font()).horizontalAdvance(QLatin1Char('x'))
* m_visibleWrapColumn * (m_visibleWrapColumn + m_visualIndentOffset)
+ data.offset.x() + 4; + data.offset.x() + 4;
if (m_marginSettings.m_tintMarginArea && data.rightMargin < data.viewportRect.width()) { if (m_marginSettings.m_tintMarginArea && data.rightMargin < data.viewportRect.width()) {
const QRectF behindMargin(data.rightMargin, const QRectF behindMargin(data.rightMargin,