Skip to content

Do not overwrite an open dialog when a primary page opens #334

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
manolo wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

Do not overwrite an open dialog when a primary page opens #334

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
16 changes: 13 additions & 3 deletions framework/interactive/internal/interactive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,11 +1255,21 @@ void Interactive::onOpen(const QVariant& type, const QVariant& objectId, QObject
}

if (ContainerMeta::PrimaryPage == containerMeta) {
// Replace bottom item of the stack, because that always reflects the current PrimaryPage
if (m_stack.empty()) {
//! NOTE The stack holds a single primary page, and the new one replaces it.
//! It is not necessarily at the bottom: raiseWindowInStack reorders the
//! stack by activation, so an open dialog can sit below it.
int primaryPageIdx = -1;
for (int i = 0; i < m_stack.size(); ++i) {
if (uriRegister()->meta(m_stack.at(i).query.uri()).type == ContainerMeta::PrimaryPage) {
primaryPageIdx = i;
break;
}
}

if (primaryPageIdx < 0) {
m_stack.push(m_openingObject);
} else {
m_stack[0] = m_openingObject;
m_stack[primaryPageIdx] = m_openingObject;
}
} else if (ContainerMeta::QmlDialog == containerMeta) {
m_stack.push(m_openingObject);
Expand Down