Fix: Enter on the filebrowser filename label skips operator #111693

Philipp Oeser · 2023-08-30T13:25:09+02:00

Philipp Oeser commented

2023-08-30 13:25:09 +02:00

Regression from c3dfe1e204.

Above commit put a dummy dragable button over the filename (well, to
allow dragging). Enabling drag ripples down to the button ending up in
the BUTTON_STATE_HIGHLIGHT state [which is still good of course].
However, ui_do_but_EXIT will then return WM_UI_HANDLER_BREAK which
then results in the filebrowser operator being skipped.

ui_do_but_EXIT already had a special case for file-browser drag button
[which would return WM_UI_HANDLER_CONTINUE instead]. Formerly this was
just the icon, now it is the icon and filename label. So in order to fix
this, remove the explicit check for the but->imb which will then
include the dragable label button in the exception for returning
WM_UI_HANDLER_CONTINUE.

Fixes #111645.

Regression from c3dfe1e20440cdf98ad84d781d5d1ba91d549cf0. Above commit put a dummy dragable button over the filename (well, to allow dragging). Enabling drag ripples down to the button ending up in the `BUTTON_STATE_HIGHLIGHT` state [which is still good of course]. However, `ui_do_but_EXIT` will then return `WM_UI_HANDLER_BREAK` which then results in the filebrowser operator being skipped. `ui_do_but_EXIT` already had a special case for file-browser drag button [which would return `WM_UI_HANDLER_CONTINUE` instead]. Formerly this was just the icon, now it is the icon and filename label. So in order to fix this, remove the explicit check for the `but->imb` which will then include the dragable label button in the exception for returning `WM_UI_HANDLER_CONTINUE`. Fixes #111645.

👍 1

Philipp Oeser added 1 commit 2023-08-30 13:25:22 +02:00

5966517824 Fix: Enter on the filebrowser filename label skips operator

Regression from c3dfe1e204.

Above commit put a dummy dragable button over the filename (well, to
allow dragging). Enabling drag ripples down to the button ending up in
the `BUTTON_STATE_HIGHLIGHT` state [which is still good of course].
However, `ui_do_but_EXIT` will then return `WM_UI_HANDLER_BREAK` which
then results in the filebrowser operator being skipped.

`ui_do_but_EXIT` already had a special case for file-browser drag button
[which would return `WM_UI_HANDLER_CONTINUE` instead]. Formerly this was
just the icon, now it is the icon and filename label. So in order to fix
this, remove the explicit check for the `but->imb` which will then
include the dragable label button in the exception for returning
`WM_UI_HANDLER_CONTINUE`.

Fixes #111645.

Philipp Oeser requested review from Julian Eisel 2023-08-30 13:25:30 +02:00

Philipp Oeser added this to the User Interface project 2023-08-30 13:25:36 +02:00

Julian Eisel approved these changes 2023-08-30 15:20:00 +02:00

Philipp Oeser merged commit 4cf0e7acfb into main

2023-08-30 16:19:44 +02:00

Philipp Oeser referenced this issue from a commit

2023-08-30 16:19:46 +02:00

Fix: Enter on the filebrowser filename label skips operator

Philipp Oeser deleted branch 111645

2023-08-30 16:19:48 +02:00

Stefan Werner referenced this issue from a commit

2023-09-07 15:02:37 +02:00