Skip to content
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

Jump to bottom

Fix the maximization of sub windows #7530

Merged
merged 11 commits into from
Oct 10, 2024
Merged

Fix the maximization of sub windows #7530

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9a1eaac
Maximize button for resizable instruments
michaelgregorius Sep 20, 2024
eec9df1
Fix rendering of maximized sub windows
michaelgregorius Sep 22, 2024
f5d2544
Add SubWindow::addTitleButton
michaelgregorius Sep 22, 2024
cdef4b5
Only disable the minimize button
michaelgregorius Sep 22, 2024
0921c97
Remove dependency on MdiArea
michaelgregorius Sep 22, 2024
4b0beb4
Typo and newline at end of file
michaelgregorius Sep 22, 2024
f4f4d11
Revert "Maximize button for resizable instruments"
michaelgregorius Oct 3, 2024
6b953fc
Set Qt::CustomizeWindowHint
michaelgregorius Oct 4, 2024
40a90ad
Remove calls to isMaximized
michaelgregorius Oct 9, 2024
e89694a
Code review
michaelgregorius Oct 10, 2024
d5be2e5
Make return a one-liner
michaelgregorius Oct 10, 2024
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
23 changes: 23 additions & 0 deletions src/gui/SubWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ SubWindow::SubWindow(QWidget *parent, Qt::WindowFlags windowFlags) :
*/
void SubWindow::paintEvent( QPaintEvent * )
{
// Don't paint any of the other stuff if the sub window is maximized
JohannesLorenz marked this conversation as resolved.
Show resolved Hide resolved
// so that only it child content is painted.
if (isMaximized())
michaelgregorius marked this conversation as resolved.
Show resolved Hide resolved
{
return;
}

QPainter p( this );
QRect rect( 0, 0, width(), m_titleBarHeight );

Expand Down Expand Up @@ -295,9 +302,25 @@ void SubWindow::moveEvent( QMoveEvent * event )
*/
void SubWindow::adjustTitleBar()
{
// Don't show the title or any button if the sub window is maximized. Otherwise they
// might show up behind the actual maximized content of the child widget.
if (isMaximized())
{
m_closeBtn->hide();
m_maximizeBtn->hide();
m_restoreBtn->hide();
m_windowTitle->hide();

return;
JohannesLorenz marked this conversation as resolved.
Show resolved Hide resolved
}

// Title adjustments
m_windowTitle->show();

// button adjustments
m_maximizeBtn->hide();
JohannesLorenz marked this conversation as resolved.
Show resolved Hide resolved
m_restoreBtn->hide();
m_closeBtn->show();

const int rightSpace = 3;
const int buttonGap = 1;
Expand Down
34 changes: 20 additions & 14 deletions src/gui/instrument/InstrumentTrackWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,24 +285,30 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :

QMdiSubWindow* subWin = getGUI()->mainWindow()->addWindowedWidget( this );
Qt::WindowFlags flags = subWin->windowFlags();
if (!m_instrumentView->isResizable()) {
flags |= Qt::MSWindowsFixedSizeDialogHint;
// any better way than this?
} else {
subWin->setMaximumSize(m_instrumentView->maximumHeight() + 12, m_instrumentView->maximumWidth() + 208);
subWin->setMinimumSize( m_instrumentView->minimumWidth() + 12, m_instrumentView->minimumHeight() + 208);

if (m_instrumentView->isResizable())
{
// TODO As of writing SlicerT is the only resizable instrument. Is this code specific to SlicerT?
const auto extraSpace = QSize(12, 208);
subWin->setMaximumSize(m_instrumentView->maximumSize() + extraSpace);
subWin->setMinimumSize(m_instrumentView->minimumSize() + extraSpace);

flags |= Qt::WindowMaximizeButtonHint;
}
flags &= ~Qt::WindowMaximizeButtonHint;
subWin->setWindowFlags( flags );
else
{
flags |= Qt::MSWindowsFixedSizeDialogHint;
flags &= ~Qt::WindowMaximizeButtonHint;

// Hide the Size and Maximize options from the system menu since the dialog size is fixed.
QMenu * systemMenu = subWin->systemMenu();
systemMenu->actions().at(2)->setVisible(false); // Size
systemMenu->actions().at(4)->setVisible(false); // Maximize
}

// Hide the Size and Maximize options from the system menu
// since the dialog size is fixed.
QMenu * systemMenu = subWin->systemMenu();
systemMenu->actions().at( 2 )->setVisible( false ); // Size
systemMenu->actions().at( 4 )->setVisible( false ); // Maximize
subWin->setWindowFlags(flags);

subWin->setWindowIcon( embed::getIconPixmap( "instrument_track" ) );
subWin->setWindowIcon(embed::getIconPixmap("instrument_track"));
subWin->hide();
}

Expand Down