Fix Height for Resolve Conflicts Dialog

[alexknop]

Problem:

-With multiple conflicts to fix, sometimes the dialog box would expand beyond the screen in height and could not be resized to a smaller height.

Solution:

-Adjusted height based on content
-Set more reasonable minimum height

Fixes #7785 #6228

[claucambra]

Thanks for your contribution! I have one comment

[alexknop]

@claucambra Done. Thank you

[claucambra]

LGTM 🚀

[nilsding]

thanks for the contribution!

I like the idea of the window adapting its height to how many conflicts are present, however the current approach doesn't seem to work well; when you try to resize the window the height keeps changing until 80% of the screen height is reached.

on macOS the window will just be dragged around when I try to resize it, but on my Plasma setup it's more visible:

Screencast_20250206_103808.webm

[nilsding]

also please use rebases instead of merges when updating your branch

[alexknop]

@nilsding
I think the height glitching like this is due to the Math.min calculation. It's probably recalculating as you resize the window.
I will probably just reduce our minimum height style parameter to something like 400. With my 1366x768 screen, this was going off the screen.
Otherwise maybe I will try to automatically size it based on content list, but not make the window resizeable? Does this window need to be resizeable?

[alexknop]

@nilsding I went with the quicker and easier route. Just shrunk the minimum height requirement.
I also reduced some padding to make more use of the space.

[nilsding]

Otherwise maybe I will try to automatically size it based on content list, but not make the window resizeable? Does this window need to be resizeable?

I prefer windows to be resizable myself, it's especially useful when using screens with different resolutions.

surely there's got to be some way to only set the height initially, but for now having a smaller minimum size is fine too.