kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Remove unnecessary private Qt API usage

Browse source
This commit is contained in:
Ilya Fedin 2023-05-13 23:32:17 +04:00 • committed by John Preston
parent be0067a8c7
commit 8c58ebc136
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/style/style_core_font.cpp
View file

@ -17,7 +17,6 @@
#include <QtGui/QFontInfo> #include <QtGui/QFontInfo>
#include <QtGui/QFontDatabase> #include <QtGui/QFontDatabase>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <private/qfontengine_p.h>
void style_InitFontsResource() { void style_InitFontsResource() {
#ifdef Q_OS_MAC // Use resources from the .app bundle on macOS. #ifdef Q_OS_MAC // Use resources from the .app bundle on macOS.
@ -293,12 +292,6 @@ int registerFontFamily(const QString &family) {
return result; return result;
} }
int CeilTextWidth(const QFont &font, const QString &text) {
return text.isEmpty()
? 0
: QStackTextEngine(text, font).width(0, text.size()).ceil().toInt();
}
FontData::FontData(int size, uint32 flags, int family, Font *other) FontData::FontData(int size, uint32 flags, int family, Font *other)
: f(ResolveFont(family ? fontFamilies[family] : QString(), flags, size)) : f(ResolveFont(family ? fontFamilies[family] : QString(), flags, size))
, _m(f) , _m(f)

4
ui/style/style_core_font.h
View file

@ -68,12 +68,10 @@ enum FontFlags {
FontDifferentFlags = 0x40, FontDifferentFlags = 0x40,
}; };
[[nodiscard]] int CeilTextWidth(const QFont &font, const QString &text);
class FontData { class FontData {
public: public:
[[nodiscard]] int width(const QString &text) const { [[nodiscard]] int width(const QString &text) const {
return CeilTextWidth(f, text); return int(std::ceil(_m.horizontalAdvance(text)));
} }
[[nodiscard]] int width(const QString &text, int from, int to) const { [[nodiscard]] int width(const QString &text, int from, int to) const {
return width(text.mid(from, to)); return width(text.mid(from, to));