Quellcode durchsuchen

BUG: ctkDoubleSpinBox: Qt5: Ensure height is consistent based on sizeHintPolicy

This commit excludes code that was removed in qt/qtbase@a317ee0a6 [1] while
fixing the common style available in Qt5.

[1] https://github.com/qt/qtbase/commit/a317ee0a6fa76d1166f6da8593d39eaf7afce83c
Jean-Christophe Fillion-Robin vor 6 Jahren
Ursprung
Commit
cf6dd211ba
1 geänderte Dateien mit 4 neuen und 0 gelöschten Zeilen
  1. 4 0
      Libs/Widgets/ctkDoubleSpinBox.cpp

+ 4 - 0
Libs/Widgets/ctkDoubleSpinBox.cpp

@@ -1065,6 +1065,7 @@ QSize ctkDoubleSpinBox::sizeHint() const
   QStyleOptionSpinBox opt;
   d->SpinBox->initStyleOptionSpinBox(&opt);
 
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
   QSize extraSize(35, 6);
   opt.rect.setSize(newSizeHint + extraSize);
   extraSize += newSizeHint - this->style()->subControlRect(
@@ -1076,6 +1077,7 @@ QSize ctkDoubleSpinBox::sizeHint() const
     QStyle::CC_SpinBox, &opt,
     QStyle::SC_SpinBoxEditField, this).size();
   newSizeHint += extraSize;
+#endif
 
   opt.rect = this->rect();
   d->CachedSizeHint = this->style()->sizeFromContents(
@@ -1114,6 +1116,7 @@ QSize ctkDoubleSpinBox::minimumSizeHint() const
   QStyleOptionSpinBox opt;
   d->SpinBox->initStyleOptionSpinBox(&opt);
 
+#if QT_VERSION < QT_VERSION_CHECK(5,1,0)
   QSize extraSize(35, 6);
   opt.rect.setSize(newSizeHint + extraSize);
   extraSize += newSizeHint - this->style()->subControlRect(
@@ -1125,6 +1128,7 @@ QSize ctkDoubleSpinBox::minimumSizeHint() const
     QStyle::CC_SpinBox, &opt,
     QStyle::SC_SpinBoxEditField, this).size();
   newSizeHint += extraSize;
+#endif
 
   opt.rect = this->rect();
   d->CachedMinimumSizeHint = this->style()->sizeFromContents(