Skip to content

Make dock toggle raise an open panel that is hidden behind another tab #333

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

Open
Ash-86 wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −1
Open

Make dock toggle raise an open panel that is hidden behind another tab #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion framework/dockwindow/qml/Muse/Dock/dockpageview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,18 @@ bool DockPageView::isDockOpen(const QString& dockName) const

void DockPageView::toggleDock(const QString& dockName)
{
setDockOpen(dockName, !isDockOpen(dockName));
DockBase* dock = dockByName(dockName);
if (!dock) {
return;
}

DockPanelView* panel = dynamic_cast<DockPanelView*>(dock);
if (panel && panel->isOpen() && !panel->isCurrentTab()) {
panel->makeCurrentTab();
return;
}

setDockOpen(dockName, !dock->isOpen());
}

void DockPageView::setDockOpen(const QString& dockName, bool open)
Expand Down
12 changes: 12 additions & 0 deletions framework/dockwindow/qml/Muse/Dock/dockpanelview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,3 +310,15 @@ void DockPanelView::setCurrentTabIndex(int index)
frame->setCurrentTabIndex(index);
}
}

bool DockPanelView::isCurrentTab() const
{
return dockWidget() && dockWidget()->isCurrentTab();
}

void DockPanelView::makeCurrentTab()
{
if (dockWidget()) {
dockWidget()->setAsCurrentTab();
}
}
2 changes: 2 additions & 0 deletions framework/dockwindow/qml/Muse/Dock/dockpanelview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class DockPanelView : public DockBase
bool isTabAllowed(const DockPanelView* tab) const;
void addPanelAsTab(DockPanelView* tab);
void setCurrentTabIndex(int index);
bool isCurrentTab() const;
void makeCurrentTab();

public slots:
void setGroupName(const QString& name);
Expand Down