diff --git a/app/fullscreencontent.cpp b/app/fullscreencontent.cpp --- a/app/fullscreencontent.cpp +++ b/app/fullscreencontent.cpp @@ -151,7 +151,7 @@ mInformationLabel = new QLabel; mInformationLabel->setWordWrap(true); mInformationLabel->setContentsMargins(6, 0, 6, 0); - mInformationLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding); + mInformationLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); mInformationLabel->setAutoFillBackground(true); mInformationLabelShadow = new ShadowFilter(mInformationLabel); @@ -323,7 +323,7 @@ layout->addWidget(mInformationLabel); layout->addWidget(mRightToolBar); - mAutoHideContainer->setFixedHeight(mContent->sizeHint().height()); + mAutoHideContainer->setFixedHeight(mToolBar->sizeHint().height()); // Shadows mToolBarShadow->reset(); diff --git a/app/viewmainpage.h b/app/viewmainpage.h --- a/app/viewmainpage.h +++ b/app/viewmainpage.h @@ -73,6 +73,7 @@ int statusBarHeight() const; QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const Q_DECL_OVERRIDE; /** * Returns the url of the current document, or an invalid url if unknown diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp --- a/app/viewmainpage.cpp +++ b/app/viewmainpage.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -569,6 +570,26 @@ return QSize(400, 300); } +QSize ViewMainPage::minimumSizeHint() const { + if (!layout()) { + return QSize(); + } + + QSize minimumSize = layout()->minimumSize(); + if (window()->isFullScreen()) { + // Check minimum width of the overlay fullscreen bar + // since there is no layout link which could do this + const FullScreenBar* fullScreenBar = findChild(); + if (fullScreenBar && fullScreenBar->layout()) { + const int fullScreenBarWidth = fullScreenBar->layout()->minimumSize().width(); + if (fullScreenBarWidth > minimumSize.width()) { + minimumSize.setWidth(fullScreenBarWidth); + } + } + } + return minimumSize; +} + QUrl ViewMainPage::url() const { GV_RETURN_VALUE_IF_FAIL(d->currentView(), QUrl());