Commit 7edce5a0 authored by Felix Ernst's avatar Felix Ernst Committed by Elvis Angelaccio
Browse files

Fix width issues when un-maximizing Dolphin

Before this commit un-maximizing or to be more precise instantly
changing the size of the window by a large amount could potentially
change the width of the sidebars, the viewContainers and the window
itself to unexpected/undesired widths.

This happened because the spacing calculation is triggered when the
primary ViewContainer is resized but at this point in time some of
the other widgets, especially the secondary ViewContainer and the
navigatorsWidget have generally not been resized yet. Therefore the
width and spacing calculations are based on partly updated and
partly outdated values leading to wrong results.

This commit makes it so calculation of spacings is delayed until
all widths have been updated.

Yes, spacing probably should not have the power to resize the
window but unfortunately the spacing can not be set to be less
forceful when taking space because otherwise the UrlNavigators
will take all space they can get with their
QSizePolicy::MinimumExpanding.

BUG: 430521
FIXED-IN: 21.08
parent ea7d4f05
Pipeline #72951 passed with stage
in 4 minutes and 55 seconds
......@@ -47,6 +47,7 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
void DolphinNavigatorsWidgetAction::adjustSpacing()
{
m_previousWindowWidth = parentWidget()->window()->width();
auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
const QList<int> splitterSizes = {widthOfSplitterPrimary,
......@@ -310,7 +311,17 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper
bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
{
if (event->type() == QEvent::Resize) {
if (m_navigatorsWidgetAction->parentWidget()->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) {
// The window is being resized which means not all widgets have gotten their new sizes yet.
// Let's wait a bit so the sizes of the navigatorsWidget and the viewContainers have all
// had a chance to be updated.
m_navigatorsWidgetAction->m_adjustSpacingTimer->start();
} else {
m_navigatorsWidgetAction->adjustSpacing();
// We could always use the m_adjustSpacingTimer instead of calling adjustSpacing() directly
// here but then the navigatorsWidget doesn't fluently align with the viewContainers when
// the DolphinTabPage::m_expandViewAnimation is animating.
}
return false;
}
return QObject::eventFilter(watched, event);
......
......@@ -216,6 +216,12 @@ private:
};
ViewGeometriesHelper m_viewGeometriesHelper;
/**
* Used to check if the window has been resized.
* @see ViewGeometriesHelper::eventFilter() for why this is needed.
*/
int m_previousWindowWidth = -1;
};
#endif // DOLPHINNAVIGATORSWIDGETACTION_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment