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

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:111645 into main 2023-08-30 16:19:44 +02:00
Member

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.
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 deleted branch 111645 2023-08-30 16:19:48 +02:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#111693
No description provided.