Workaround for enormous contents size of item-views

tsujan · Feb 10, 2023 · f64a347 · f64a347
1 parent 990763d
commit f64a347
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Kvantum/ChangeLog b/Kvantum/ChangeLog
@@ -1,6 +1,7 @@
 V1.0.9
 ---------
  * Fixed a regression that caused crashes in QML apps and LibreOffice when the widget animation was disabled.
+ * Workaround for bad codes that give an enormous contents size to item-views.
 
 V1.0.8
 ---------

diff --git a/Kvantum/style/Kvantum.cpp b/Kvantum/style/Kvantum.cpp
@@ -4674,7 +4674,8 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
                             && opacityTimer_ && opacityTimer_->isActive()
                             && (!status.startsWith(QLatin1String("normal"))
                                 || animationStartState_.startsWith(QLatin1String("focused"))));
-        bool animate(opacityTimer_ && cb && cb->isEnabled()
+        bool animate(opacityTimer_
+                     && cb && cb->isEnabled()
                      && (mouseAnimation
                          || (animatedWidgetOut_ == widget
                              && opacityTimerOut_->isActive()
@@ -14668,8 +14669,9 @@ QSize Style::sizeFromContents(QStyle::ContentsType type,
         const size_spec sspec = getSizeSpec("ItemView");
         s = s.expandedTo(QSize(0, // minW doesn't have meaning here
                                sspec.minH + (sspec.incrementH ? s.height() : 0)));
+        return s;
       }
-      return s.expandedTo(contentsSize);
+      return contentsSize;
     }
 
     case CT_TabWidget : {