diff options
| author |  Fabio Bas | 2023-10-04 11:41:01 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | d885214689e6f1f103bb9be55af8a6348b1535e4 (patch) | |
| tree | 0af810caf04a887b48612d523a924ea2fbf26637 | |
| parent | Port from QRegExp (unavailable on qt6) to KviRegExp, based on QRegularExpression (diff) | |
| download | KVIrc-d885214689e6f1f103bb9be55af8a6348b1535e4.tar.gz KVIrc-d885214689e6f1f103bb9be55af8a6348b1535e4.tar.bz2 KVIrc-d885214689e6f1f103bb9be55af8a6348b1535e4.zip | |
Drop QApplication::globalStrut() usage (unavailable on qt6)
| -rw-r--r-- | src/kvilib/tal/KviTalListWidget.cpp | 13 | ||||
| -rw-r--r-- | src/kvirc/ui/KviInputEditor.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/KviTopicWidget.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/KviWindowListBase.cpp | 4 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp index 9bc66812c..653b1ae01 100644 --- a/src/kvilib/tal/KviTalListWidget.cpp +++ b/src/kvilib/tal/KviTalListWidget.cpp @@ -104,14 +104,12 @@ void KviTalListWidgetText::paint(QPainter * painter) int KviTalListWidgetText::height(const KviTalListWidget * lb) const { - int h = lb ? lb->fontMetrics().lineSpacing() + 2 : 0; - return qMax(h, QApplication::globalStrut().height()); + return lb ? lb->fontMetrics().lineSpacing() + 2 : 0; } int KviTalListWidgetText::width(const KviTalListWidget * lb) const { - int w = lb ? lb->fontMetrics().horizontalAdvance(text()) + 6 : 0; - return qMax(w, QApplication::globalStrut().width()); + return lb ? lb->fontMetrics().horizontalAdvance(text()) + 6 : 0; } int KviTalListWidgetText::rtti() const @@ -176,15 +174,14 @@ int KviTalListWidgetPixmap::height(const KviTalListWidget * lb) const h = pm.height(); else h = qMax(pm.height(), lb->fontMetrics().lineSpacing() + 2); - return qMax(h, QApplication::globalStrut().height()); + return h; } int KviTalListWidgetPixmap::width(const KviTalListWidget * lb) const { if(text().isEmpty()) - return qMax(pm.width() + 6, QApplication::globalStrut().width()); - return qMax(pm.width() + lb->fontMetrics().horizontalAdvance(text()) + 6, - QApplication::globalStrut().width()); + return pm.width() + 6; + return pm.width() + lb->fontMetrics().horizontalAdvance(text()) + 6; } int KviTalListWidgetPixmap::rtti() const diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index 62f48edd3..0231bb74d 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -310,7 +310,7 @@ QFontMetrics * KviInputEditor::getLastFontMetrics(const QFont & font) option.state |= QStyle::State_Sunken; option.features = QStyleOptionFrame::None; - QSize dummySize = style()->sizeFromContents(QStyle::CT_LineEdit, &option, QSize(w, h).expandedTo(QApplication::globalStrut()), this); + QSize dummySize = style()->sizeFromContents(QStyle::CT_LineEdit, &option, QSize(w, h), this); g_iCachedHeight = dummySize.height(); return g_pLastFontMetrics; diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 7e10be134..d37b53353 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -449,7 +449,7 @@ QSize KviTopicWidget::sizeHint() const option.state |= QStyle::State_Sunken; option.features = QStyleOptionFrame::None; - return (style()->sizeFromContents(QStyle::CT_LineEdit, &option, QSize(w, h).expandedTo(QApplication::globalStrut()), this)); + return (style()->sizeFromContents(QStyle::CT_LineEdit, &option, QSize(w, h), this)); } void KviTopicWidget::switchMode() diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp index 54df0d3af..f7f47adae 100644 --- a/src/kvirc/ui/KviWindowListBase.cpp +++ b/src/kvirc/ui/KviWindowListBase.cpp @@ -229,10 +229,10 @@ QSize KviWindowListTitleWidget::sizeHint() const h = 6; } QStyleOption opt(0); - opt.init(m_pParent); + opt.initFrom(m_pParent); opt.state = QStyle::State_None; // - return m_pParent->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(w, h), m_pParent).expandedTo(QApplication::globalStrut()); + return m_pParent->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(w, h), m_pParent); } // // KviWindowListItem |