lower minimum window height for ResolveConflictsDialog

[nilsding]

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

[claucambra]

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 :)

[alexknop]

My apologies, I was was working on this in parallel in #7815

This also appears to fix #6228

It is an annoying issue for some screens like mine.
My only complaint is the height when I opened my dialog looked like this

I was able to drag down the dialog box to a more appropriate height.

Perhaps we can combine our changes:

1. Lowering the minimum height to 500 in Style.qml
2. Making Height equal to Math.min(contentItem.height + 20, Screen.height * 0.8) in ResolveConflictsDialog.qml

[github-actions]

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

SHA256 checksum: 9afde478fa3c54fe0243a549158be2b4edcf98da08c4921b018dd548a0604051

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.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud