Skip to content

[detach-window] Attach windows on close instead of show #8089

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
messmerd merged 2 commits into from
Oct 16, 2025
Merged

[detach-window] Attach windows on close instead of show #8089

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
03a0904
Attach windows on close instead of show
sqrvrt Oct 14, 2025
fab4127
use dynamic_cast instead of C cast
sqrvrt Oct 14, 2025
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
2 changes: 1 addition & 1 deletion include/SubWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ class LMMS_EXPORT SubWindow : public QMdiSubWindow
public slots:
void detach();
void attach();
void setVisible(bool visible) override;

protected:
// hook the QWidget move/resize events to update the tracked geometry
void moveEvent( QMoveEvent * event ) override;
void resizeEvent( QResizeEvent * event ) override;
void paintEvent( QPaintEvent * pe ) override;
void changeEvent( QEvent * event ) override;
void showEvent(QShowEvent* event) override;
bool eventFilter(QObject* obj, QEvent* event) override;

bool isDetached() const;
Expand Down
4 changes: 3 additions & 1 deletion src/gui/DetachableWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@

#include "GuiApplication.h"
#include "MainWindow.h"
#include "SubWindow.h"

namespace lmms::gui {

void DetachableWidget::closeEvent(QCloseEvent* ce)
{
if (windowFlags().testFlag(Qt::Window))
{
ce->accept();
dynamic_cast<SubWindow&>(*parentWidget()).attach();
ce->ignore();
}
else if (getGUI()->mainWindow()->workspace())
{
Expand Down
4 changes: 3 additions & 1 deletion src/gui/DetachableWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@

#include "GuiApplication.h"
#include "MainWindow.h"
#include "SubWindow.h"

namespace lmms::gui {

void DetachableWindow::closeEvent(QCloseEvent* ce)
{
if (windowFlags().testFlag(Qt::Window))
{
ce->accept();
dynamic_cast<SubWindow&>(*parentWidget()).attach();
ce->ignore();
}
else if (getGUI()->mainWindow()->workspace())
{
Expand Down
12 changes: 9 additions & 3 deletions src/gui/SubWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,16 @@ void SubWindow::changeEvent( QEvent *event )

}

void SubWindow::showEvent(QShowEvent* e)
void SubWindow::setVisible(bool visible)
{
attach();
QMdiSubWindow::showEvent(e);
if (isDetached() && visible) // avoid showing titlebar here
{
widget()->show();
// raise the detached window in case it was minimized
widget()->setWindowState((widget()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
return;
}
QMdiSubWindow::setVisible(visible);
}

bool SubWindow::isDetached() const
Expand Down
Loading