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.

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

main_window no longer passed to BaseMainWindowView #1989

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

MikeSullivan7
Copy link
Collaborator

Issue

Closes #1429.

Description

In the Views for the additional windows (operations, spectrum viewer, reconstruct, etc), self.main_window is no longer passed to the BaseMainWindowView through super().__init__() but is still passed to the view for access. This stops the parent/child relationship between the two QMainWindows.
A side effect of this is that the additional windows do not close with the MainWindow is this is now done manually in the Main views closeEvent().

Acceptance Criteria

Open branch in Windows, load in data and then open the Operations, Live Viewer, Spectrum Viewer, and Reconstruction windows and check that the Main window can now sit on top when clicked. All interactions between the additional windows and the main windows should work the same as before.

Check that the program still behaves as it did before in Linux.

@coveralls
Copy link

Coverage Status

coverage: 75.549% (-0.08%) from 75.633%
when pulling 259853f on 1429_main_window_sits_behind
into 774a4e8 on main.

@samtygier-stfc
Copy link
Collaborator

All good on the linux side. I'll try to give Windows a test later.

Copy link
Collaborator

@samtygier-stfc samtygier-stfc left a comment

Choose a reason for hiding this comment

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

Looks good. Tested on Linux and Windows

@samtygier-stfc samtygier-stfc added this pull request to the merge queue Dec 13, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 13, 2023
@samtygier-stfc samtygier-stfc added this pull request to the merge queue Dec 13, 2023
Merged via the queue into main with commit 14f2c7f Dec 13, 2023
8 checks passed
@samtygier-stfc samtygier-stfc deleted the 1429_main_window_sits_behind branch December 13, 2023 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Highlighting main window doesn't bring it to front on Windows
3 participants