[2.3] Prevent preferences dialog from going out of screen #4613

ninomp · 2022-01-09T00:13:04Z

This fixes https://bugs.launchpad.net/mixxx/+bug/1938653.

Could someone check if this causes a regression on macOS?

This fixes https://bugs.launchpad.net/mixxx/+bug/1938653.

JoergAtGithub · 2022-01-09T07:58:17Z

On Windows7 the dialog height fits perfect (using the artifact download from this PR):

Swiftb0y · 2022-01-09T13:28:29Z

src/preferences/dialog/dlgpreferences.cpp

+    if (windowDecorationWidth <= 0) {
+        windowDecorationWidth = 2;
+    }
+    if (windowDecorationHeight <= 0) {
+        windowDecorationHeight = 30;
+    }


this does not make sense to me. Would you mind giving some explanation?

I'm currently debugging a similiar issue with DlgDevTools¹ and I ended up here, too:

Those magic numbers are used as default window decoration dimensions in QRect DlgPreferences::getDefaultGeometry() in case they cannot be retireved from the OS. !?

¹when I open it the initial window it's like 10.000 pixels wide

Swiftb0y · 2022-01-09T13:31:01Z

src/preferences/dialog/dlgpreferences.cpp

+    newX = std::max(0, std::min(newX, availableWidth - newWidth));
+    newY = std::max(0, std::min(newY, availableHeight - newHeight));


https://en.cppreference.com/w/cpp/algorithm/clamp

Suggested change

newX = std::max(0, std::min(newX, availableWidth - newWidth));

newY = std::max(0, std::min(newY, availableHeight - newHeight));

newX = std::clamp(availableWidth - newWidth, 0, newX);

newY = std::clamp(availableHeight - newHeight, 0, newY);

Swiftb0y · 2022-01-09T13:33:32Z

src/preferences/dialog/dlgpreferences.cpp

+    int availableWidth = screenSpace.width() - windowDecorationWidth;
+    int availableHeight = screenSpace.height() - windowDecorationHeight;
+    newWidth = std::min(newWidth, availableWidth);
+    newHeight = std::min(newHeight, availableHeight);


this does not make sense to me either.

ronso0 · 2022-01-09T22:17:02Z

src/preferences/dialog/dlgpreferences.cpp

@@ -371,12 +373,29 @@ void DlgPreferences::onShow() {
        screenSpace = QSize(800, 600);
    }
    else {
-        screenSpace = pScreen->size();
+        screenSpace = pScreen->availableSize();


availableSize returns QSize(width, height)

Did you consider pScreen->availableGeometry() here? It returns QRect(int x, int y, int width, int height)

ronso0 · 2022-01-09T23:36:33Z

src/preferences/dialog/dlgpreferences.cpp

-    newY = std::max(0, std::min(newY, screenSpace.height() - m_geometry[3].toInt()));
+
+    // Make sure the entire window is visible on screen and is not occluded by taskbar
+    // Note: Window geometry excludes window decoration


Suggested change

// Note: Window geometry excludes window decoration

// The window's frameGeometry() includes window decoration, geometry() does not

Do you mind updating the comments in resizeEvent() and moveEvent()?

ronso0 · 2022-01-09T23:41:52Z

src/preferences/dialog/dlgpreferences.cpp

+    if (windowDecorationWidth <= 0) {
+        windowDecorationWidth = 2;
+    }
+    if (windowDecorationHeight <= 0) {
+        windowDecorationHeight = 30;
+    }


I'm currently debugging a similiar issue with DlgDevTools¹ and I ended up here, too:

Those magic numbers are used as default window decoration dimensions in QRect DlgPreferences::getDefaultGeometry() in case they cannot be retireved from the OS. !?

¹when I open it the initial window it's like 10.000 pixels wide

foss- · 2022-01-13T10:37:53Z

Looking fine on a 15" retina MacBook Pro when opening preferences from mixxx in windowed mode.
When using mixxx in fullscreen mode and then pressing ⌘, to open preferences, the view switches away from fullscreen. Iirc this is expected behavior for qt or something like that. However e.g. Apple Pages would behave as expected by opening the preferences over the fullscreen main window and not switching away from the main window. But there may not be a workaround for that problem with qt. Also that is not the scope of this PR.

No obvious regression I was able to spot.

github-actions · 2022-04-19T00:06:40Z

This PR is marked as stale because it has been open 90 days with no activity.

ronso0 · 2022-05-28T19:54:12Z

Works nicely. Pref window is moved back into the screen if it has moved out.
Pre-commit complains about misaligned comments https://github.com/mixxxdj/mixxx/runs/6602758840?check_suite_focus=true#step:6:133

@Swiftb0y Any comments?

Swiftb0y · 2022-05-30T11:25:43Z

LGTM once the pre-commit issues have been resolved.

Swiftb0y

@ronso0 merge?

ronso0 · 2022-05-31T01:51:38Z

yup, thank you!

ninomp · 2022-05-31T16:18:40Z

Thank you all for reviewing and testing this! ❤️

Prevent preferences dialog from going out of screen

cc86bf3

This fixes https://bugs.launchpad.net/mixxx/+bug/1938653.

github-actions bot added the ui label Jan 9, 2022

ninomp changed the title ~~Prevent preferences dialog from going out of screen~~ [2.3] Prevent preferences dialog from going out of screen Jan 9, 2022

Swiftb0y reviewed Jan 9, 2022

View reviewed changes

ronso0 reviewed Jan 9, 2022

View reviewed changes

ronso0 requested changes Jan 9, 2022

View reviewed changes

github-actions bot added the stale Stale issues that haven't been updated for a long time. label Apr 19, 2022

ninomp added 2 commits May 14, 2022 01:00

Merge branch '2.3' into 2.3-fix-prefs-dlg-positioning

6f8f8dc

Prevent preferences dialog from being shown with buttons behind taskbar

cc0b7bb

ronso0 marked this pull request as ready for review May 28, 2022 19:54

github-actions bot removed the stale Stale issues that haven't been updated for a long time. label May 29, 2022

Resolve code style issue pointed out by clang-format pre-commit hook

3f7fc18

Swiftb0y approved these changes May 31, 2022

View reviewed changes

ronso0 merged commit 09a4314 into mixxxdj:2.3 May 31, 2022

ninomp deleted the 2.3-fix-prefs-dlg-positioning branch May 31, 2022 16:17

mixxxbot mentioned this pull request Aug 23, 2022

Preferences Dialog's confirmation buttons are hidden behind Windows taskbar #10487

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2.3] Prevent preferences dialog from going out of screen #4613

[2.3] Prevent preferences dialog from going out of screen #4613

ninomp commented Jan 9, 2022

JoergAtGithub commented Jan 9, 2022

Swiftb0y Jan 9, 2022

ronso0 Jan 9, 2022 •

edited

Loading

Swiftb0y Jan 9, 2022

Swiftb0y Jan 9, 2022

ronso0 Jan 9, 2022 •

edited

Loading

ronso0 Jan 9, 2022

ronso0 Jan 9, 2022

ronso0 Jan 9, 2022 •

edited

Loading

foss- commented Jan 13, 2022 •

edited

Loading

github-actions bot commented Apr 19, 2022

ronso0 commented May 28, 2022

Swiftb0y commented May 30, 2022

Swiftb0y left a comment

ronso0 commented May 31, 2022

ninomp commented May 31, 2022

		newX = std::max(0, std::min(newX, availableWidth - newWidth));
		newY = std::max(0, std::min(newY, availableHeight - newHeight));

	// Note: Window geometry excludes window decoration
	// The window's frameGeometry() includes window decoration, geometry() does not

[2.3] Prevent preferences dialog from going out of screen #4613

[2.3] Prevent preferences dialog from going out of screen #4613

Conversation

ninomp commented Jan 9, 2022

JoergAtGithub commented Jan 9, 2022

Swiftb0y Jan 9, 2022

Choose a reason for hiding this comment

ronso0 Jan 9, 2022 • edited Loading

Choose a reason for hiding this comment

Swiftb0y Jan 9, 2022

Choose a reason for hiding this comment

Swiftb0y Jan 9, 2022

Choose a reason for hiding this comment

ronso0 Jan 9, 2022 • edited Loading

Choose a reason for hiding this comment

ronso0 Jan 9, 2022

Choose a reason for hiding this comment

ronso0 Jan 9, 2022

Choose a reason for hiding this comment

ronso0 Jan 9, 2022 • edited Loading

Choose a reason for hiding this comment

foss- commented Jan 13, 2022 • edited Loading

github-actions bot commented Apr 19, 2022

ronso0 commented May 28, 2022

Swiftb0y commented May 30, 2022

Swiftb0y left a comment

Choose a reason for hiding this comment

ronso0 commented May 31, 2022

ninomp commented May 31, 2022

ronso0 Jan 9, 2022 •

edited

Loading

ronso0 Jan 9, 2022 •

edited

Loading

ronso0 Jan 9, 2022 •

edited

Loading

foss- commented Jan 13, 2022 •

edited

Loading