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

lower minimum window height for ResolveConflictsDialog #7791

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

nilsding
Copy link
Member

fixes #7785

IMO there's no need for the ResolveConflictsDialog to be that tall, especially when it's just one or two files conflicting... and there's a scrollview anyway.

fwiw the QWidgets-based OCC::ConflictDialog that's still used to resolve only single file-conflicts has a height of 407 defined in its .ui file

Screenshot_20250124_111408

@nilsding nilsding added this to the 3.16.0 milestone Jan 24, 2025
@nilsding nilsding self-assigned this Jan 24, 2025
Copy link

Artifact containing the AppImage: nextcloud-appimage-pr-7791.zip

SHA256 checksum: 0d52f635b38b65a8e1d5f9990bc89286b84e8328494e355fb693fb43bdf01a5a

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

Seems like a sensible change but I think there may be even more improvements we can make here to reduce the vertical space -- the button box at the bottom seems t have excessive padding for example. Food for thought :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Window for solving synchronization conflicts is oversized
2 participants