lower minimum window height for ResolveConflictsDialog #7791
+1
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 of407
defined in its .ui file