Skip to content

Ensure the restore button of a subwindow shows up correctly #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 2 commits into from
Feb 12, 2019
Merged

Ensure the restore button of a subwindow shows up correctly #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9917ea
SubWindow: ensure the restore button shows up correctly
PhysSong Feb 10, 2019
9a63575
Remove old workaround for the maximize behavior on Mac
PhysSong Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/SubWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class EXPORT SubWindow : public QMdiSubWindow
QGraphicsDropShadowEffect * m_shadow;

static void elideText( QLabel *label, QString text );
bool isMaximized();
void adjustTitleBar();
};

Expand Down
22 changes: 4 additions & 18 deletions src/gui/SubWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,6 @@ void SubWindow::elideText( QLabel *label, QString text )



bool SubWindow::isMaximized()
{
#ifdef LMMS_BUILD_APPLE
// check if subwindow size is identical to the MdiArea size, accounting for scrollbars
int hScrollBarHeight = mdiArea()->horizontalScrollBar()->isVisible() ? mdiArea()->horizontalScrollBar()->size().height() : 0;
int vScrollBarWidth = mdiArea()->verticalScrollBar()->isVisible() ? mdiArea()->verticalScrollBar()->size().width() : 0;
QSize areaSize( this->mdiArea()->size().width() - vScrollBarWidth, this->mdiArea()->size().height() - hScrollBarHeight );

return areaSize == this->size();
#else
return QMdiSubWindow::isMaximized();
#endif
}




QRect SubWindow::getTrueNormalGeometry() const
{
return m_trackedNormalGeom;
Expand Down Expand Up @@ -302,8 +285,11 @@ void SubWindow::adjustTitleBar()

void SubWindow::resizeEvent( QResizeEvent * event )
{
adjustTitleBar();
// When the parent QMdiArea gets resized, maximized subwindows also gets resized, if any.
// In that case, we should call QMdiSubWindow::resizeEvent first
// to ensure we get the correct window state.
QMdiSubWindow::resizeEvent( event );
adjustTitleBar();

// if the window was resized and ISN'T minimized/maximized/fullscreen,
// then save the current size
Expand Down