Skip to content

when a modal window exists, do not switch pages #1534

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
Merged
deepin-bot merged 1 commit into from
Jan 5, 2024
Merged

when a modal window exists, do not switch pages #1534

deepin-bot merged 1 commit into from
Jan 5, 2024

Conversation

@Decodetalkers
Copy link
Contributor

@Decodetalkers Decodetalkers commented Dec 26, 2023

Log:

@Decodetalkers Decodetalkers requested review from a team, BLumia and kegechen December 26, 2023 07:13
@Decodetalkers Decodetalkers force-pushed the newinterface branch 2 times, most recently from 6529902 to ba7bb3b Compare December 27, 2023 06:14
@deepin-bot
Copy link

deepin-bot bot commented Dec 27, 2023

TAG Bot

New tag: 6.0.36
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #1518

@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Dec 28, 2023

@Decodetalkers Decodetalkers force-pushed the newinterface branch 3 times, most recently from 6d3129a to f3a97c4 Compare January 2, 2024 02:53
@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 2, 2024

kegechen
kegechen reviewed Jan 4, 2024
View reviewed changes
src/frame/mainwindow.cpp Outdated

void MainWindow::showPage(const QString &url, const UrlType &uType)
{
if (DccGlobalControl::instance()->isModal()) {
Copy link
Contributor

@kegechen kegechen Jan 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (DccGlobalControl::instance()->isModal()) {
if (qApp->activeModalWidget()) {

@Decodetalkers Decodetalkers changed the title feat: add a global instance to set modal fix: when modal window exist, not switch page Jan 4, 2024
@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 4, 2024

/integrate

@github-actions
Copy link

github-actions bot commented Jan 4, 2024

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#880
PrNumber: 880
PrBranch: auto-integration-7406238587

@deepin-community-ci-bot deepin-community-ci-bot bot mentioned this pull request Jan 4, 2024
Open
@zsien
Copy link
Contributor

zsien commented Jan 4, 2024

when a modal window exists, do not switch pages (

@Decodetalkers Decodetalkers changed the title fix: when modal window exist, not switch page when a modal window exists, do not switch pages Jan 4, 2024
@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 4, 2024

when a modal window exists, do not switch pages (

好了

@deepin-ci-robot
Copy link

deepin-ci-robot commented Jan 4, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Decodetalkers, zsien

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 4, 2024

/check obs

1 similar comment
@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 4, 2024

/check obs

@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 4, 2024

/check obs

@deepin-bot
Copy link

deepin-bot bot commented Jan 4, 2024 •
edited
Loading

Deepin Obs Bot
Deepin redeliveried failed, need update or recreate pull request!!!

@Decodetalkers
Copy link
Contributor Author

Decodetalkers commented Jan 5, 2024

/merge

@deepin-bot deepin-bot bot merged commit ec5da17 into linuxdeepin:master Jan 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BLumia BLumia Awaiting requested review from BLumia

@justforlxz justforlxz Awaiting requested review from justforlxz

2 more reviewers

@kegechen kegechen kegechen left review comments

@zsien zsien zsien approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Decodetalkers @zsien @deepin-ci-robot @kegechen