mirror of
https://github.com/danog/patches.git
synced 2024-12-03 09:47:58 +01:00
2b9afa7592
Backport support for opening directories with xdg desktop portals Backport fix for ibus on wayland
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
|
|
index 598d173144..fd2e636563 100644
|
|
--- a/src/widgets/widgets/qabstractscrollarea.cpp
|
|
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
|
|
@@ -655,15 +655,21 @@ scrolling range.
|
|
QSize QAbstractScrollArea::maximumViewportSize() const
|
|
{
|
|
Q_D(const QAbstractScrollArea);
|
|
- int hsbExt = d->hbar->sizeHint().height();
|
|
- int vsbExt = d->vbar->sizeHint().width();
|
|
+ // Patch: Count the sizeHint of the bar only if it is displayed.
|
|
+ //int hsbExt = d->hbar->sizeHint().height();
|
|
+ //int vsbExt = d->vbar->sizeHint().width();
|
|
|
|
int f = 2 * d->frameWidth;
|
|
QSize max = size() - QSize(f + d->left + d->right, f + d->top + d->bottom);
|
|
- if (d->vbarpolicy == Qt::ScrollBarAlwaysOn)
|
|
+ // Patch: Count the sizeHint of the bar only if it is displayed.
|
|
+ if (d->vbarpolicy == Qt::ScrollBarAlwaysOn) {
|
|
+ int vsbExt = d->vbar->sizeHint().width();
|
|
max.rwidth() -= vsbExt;
|
|
- if (d->hbarpolicy == Qt::ScrollBarAlwaysOn)
|
|
+ }
|
|
+ if (d->hbarpolicy == Qt::ScrollBarAlwaysOn) {
|
|
+ int hsbExt = d->hbar->sizeHint().height();
|
|
max.rheight() -= hsbExt;
|
|
+ }
|
|
return max;
|
|
}
|
|
|