aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/fontsettings.h
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2020-10-15 08:52:48 +0200
committerDavid Schulz <david.schulz@qt.io>2020-10-20 04:35:42 +0000
commitf220cb0e23729ddccf52c25dae4e4696641bc62d (patch)
treea9c5e932302b7d02968fd846642fafe02ecd453b /src/plugins/texteditor/fontsettings.h
parenta962a08b1ae2d600ec77f8efddb75a8402a8d084 (diff)
Revert "Editor: Make line spacing adjustable"
This does not work with text wrapping since there are multiple QTextLines inside a block but we can not adjust the line hight inside a block. This needs to be addressed inside Qt. This reverts commit dc64f3207bdf6c0d295859e47791cb8193e67f4e. Change-Id: If6c28056da9891eeeb75f5939a42f08360013a80 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/texteditor/fontsettings.h')
-rw-r--r--src/plugins/texteditor/fontsettings.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h
index 0fbc80e15d..9447141434 100644
--- a/src/plugins/texteditor/fontsettings.h
+++ b/src/plugins/texteditor/fontsettings.h
@@ -75,10 +75,6 @@ public:
int fontZoom() const;
void setFontZoom(int zoom);
- qreal lineSpacing() const;
- int relativeLineSpacing() const;
- void setRelativeLineSpacing(int relativeLineSpacing);
-
QFont font() const;
bool antialias() const;
@@ -104,19 +100,16 @@ public:
private:
void addMixinStyle(QTextCharFormat &textCharFormat, const MixinTextStyles &mixinStyles) const;
- void clearCaches();
private:
QString m_family;
QString m_schemeFileName;
int m_fontSize;
int m_fontZoom;
- int m_lineSpacing;
bool m_antialias;
ColorScheme m_scheme;
mutable QHash<TextStyle, QTextCharFormat> m_formatCache;
mutable QHash<TextStyles, QTextCharFormat> m_textCharFormatCache;
- mutable qreal m_lineSpacingCache;
};
inline bool operator==(const FontSettings &f1, const FontSettings &f2) { return f1.equals(f2); }