[BUG] Dialog window on Tree conflict during merge is not resizable

[Vicent Camarena]

If there's a "Tree Conflict" (sometimes spelled with first-letter uppercase on both words, sometimes only on "Tree") during a merge (a sort of problem that is actually not fully clear or understandable to me), a dialog window pops up to choose an action, namely "-> Postpone", "-> Mark as resolved" or "-> Ignore incoming addition". The main problem with this windows, apart from not being clear what to do because there's not enough info with was going on, is that the full text of the explanation of the options is not visible (specifically the one for the 3rd option, "-> Ignore incoming addition") as it's cut, and the dialog is not resizable and one cannot fully read what is there and the decission is difficult to take, as it's not clear what the operation is going to do and which are the affected files. 

In my case, it says something like 

"Ignore and do not add 

'^/WHATEVER/PATH/blahblah/...[fileNameCut"]

here"

If it could be resizable to the right, I probably could read the whole path and the file name, provided those weren't too long. In case they were, then potentially even if allowed to resize the window, this wouldn't provide a solution at all - line wrapping or scrolling of the long line should be provided also.

[Daniel Sahlberg]

The dialog is based on the win32 api function TaskDialogIndirect[1]. Relevant code in TreeConflictEditorDlg.cpp line 172ff. The dialog is already TDF_SIZE_TO_CONTENT and as far as I can see there is no option to further customize the layout of that dialog.

Maybe Stefan or someone else has some tricks up their sleeve.

Kind regards,

/Daniel

[1] https://learn.microsoft.com/en-us/windows/win32/api/commctrl/nf-commctrl-taskdialogindirect 

[Achim Kalwa]

Daniel Sahlberg wrote:

The dialog is based on the win32 api function TaskDialogIndirect[1]. Relevant code in TreeConflictEditorDlg.cpp line 172ff. The dialog is already TDF_SIZE_TO_CONTENT and as far as I can see there is no option to further customize the layout of that dialog.

Maybe Stefan or someone else has some tricks up their sleeve.

A possible workaround is to split the path after ~70 chars by scanning for a slash "/" and replace it with something like "\ /" (that is backslash, space, slash). The Taskdialog will wordwrap at the space position, which looks like this:

HTH

Achim

[Daniel Sahlberg]

onsdag 23 november 2022 kl. 22:14:13 UTC+1 skrev Achim Kalwa:

A possible workaround is to split the path after ~70 chars by scanning for a slash "/" and replace it with something like "\ /" (that is backslash, space, slash). The Taskdialog will wordwrap at the space position, which looks like this:

I believe such a solution was added in r29510. Maybe the original reporter can try out the latest nightly build (https://nightlybuilds.tortoisesvn.net/latest/) and see if this works better.

Kind regards,

Daniel