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

TextEditor: Allow adding additionalLineHeight

Browse Source 
Change-Id: Id47dc55a5e265dbe17f4a2920dd0e830408f847f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-10-29 06:45:02 +01:00
parent 45d4dde6ce
commit 9b7950126d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/textdocumentlayout.cpp
View File

@@ -778,7 +778,9 @@ QRectF TextDocumentLayout::blockBoundingRect(const QTextBlock &block) const
} }
if (TextBlockUserData *userData = textUserData(block)) if (TextBlockUserData *userData = textUserData(block))
boundingRect.adjust(0, 0, 0, userData->additionalAnnotationHeight()); boundingRect.adjust(
0, 0, 0, userData->additionalAnnotationHeight() + userData->additionalLineHeight());
return boundingRect; return boundingRect;
} }

5
src/plugins/texteditor/textdocumentlayout.h
View File

@@ -119,6 +119,10 @@ public:
{ m_additionalAnnotationHeight = annotationHeight; } { m_additionalAnnotationHeight = annotationHeight; }
inline int additionalAnnotationHeight() const { return m_additionalAnnotationHeight; } inline int additionalAnnotationHeight() const { return m_additionalAnnotationHeight; }
inline void setAdditionalLineHeight(int additionalLineHeight)
{ m_additionalLineHeight = additionalLineHeight; }
inline int additionalLineHeight() const { return m_additionalLineHeight; }
CodeFormatterData *codeFormatterData() const { return m_codeFormatterData; } CodeFormatterData *codeFormatterData() const { return m_codeFormatterData; }
void setCodeFormatterData(CodeFormatterData *data); void setCodeFormatterData(CodeFormatterData *data);
@@ -144,6 +148,7 @@ private:
uint m_foldingStartIncluded : 1; uint m_foldingStartIncluded : 1;
uint m_foldingEndIncluded : 1; uint m_foldingEndIncluded : 1;
int m_additionalAnnotationHeight = 0; int m_additionalAnnotationHeight = 0;
int m_additionalLineHeight = 0;
Parentheses m_parentheses; Parentheses m_parentheses;
CodeFormatterData *m_codeFormatterData; CodeFormatterData *m_codeFormatterData;
KSyntaxHighlighting::State m_syntaxState; KSyntaxHighlighting::State m_syntaxState;