Fix #119778: Crash in popovers that do not support refreshing #119796

Guillermo Venegas · 2024-03-22T16:51:10+01:00

Guillermo Venegas commented

2024-03-22 16:51:10 +01:00

When creating popover with UI_popover_begin the popover block
is created just once without a region and since UI_popover_begin blocks
are not support refreshing, layout panels may not be compatible
in this kind of popover since open/close state cannot be refreshed either.

Only UILayout.popover(...) popovers are supported to have layout panels.

When creating popover with `UI_popover_begin` the popover block is created just once without a region and since `UI_popover_begin` blocks are not support refreshing, layout panels may not be compatible in this kind of popover since open/close state cannot be refreshed either. Only `UILayout.popover(...)` popovers are supported to have layout panels.

Guillermo Venegas added 1 commit 2024-03-22 16:51:18 +01:00

52e7f55404 fix

Iliya Katushenock added this to the User Interface project 2024-03-22 17:01:59 +01:00

Iliya Katushenock requested review from Jacques Lucke 2024-03-22 17:02:07 +01:00

Guillermo Venegas commented

2024-03-22 17:05:13 +01:00

this can also fix the issue to avoid non refreshing popovers to setting the dummy panel

diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index 0e80e153235..34f8f96160e 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -2968,6 +2968,8 @@ void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt)
 void ui_item_paneltype_func(bContext *C, uiLayout *layout, void *arg_pt)
 {
   PanelType *pt = (PanelType *)arg_pt;
+  uiBlock *block = uiLayoutGetBlock(layout);
+  UI_popup_dummy_panel_set(block->handle->region, block);
   UI_paneltype_draw(C, pt, layout);
 }

@@ -6144,12 +6146,6 @@ static void ui_paneltype_draw_impl(bContext *C, PanelType *pt, uiLayout *layout,
     ui_block_add_dynamic_listener(block, pt->listener);
   }

-  /* This check may be paranoid, this function might run outside the context of a popup. */
-  if (block->handle) {
-    /* Allow popovers to contain collapsible sections, see #uiItemPopoverPanel. */
-    UI_popup_dummy_panel_set(block->handle->region, block);
-  }
-
   uiLayout *last_item = static_cast<uiLayout *>(layout->items.last);

this can also fix the issue to avoid non refreshing popovers to setting the dummy panel ```diff diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 0e80e153235..34f8f96160e 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -2968,6 +2968,8 @@ void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt) void ui_item_paneltype_func(bContext *C, uiLayout *layout, void *arg_pt) { PanelType *pt = (PanelType *)arg_pt; + uiBlock *block = uiLayoutGetBlock(layout); + UI_popup_dummy_panel_set(block->handle->region, block); UI_paneltype_draw(C, pt, layout); } @@ -6144,12 +6146,6 @@ static void ui_paneltype_draw_impl(bContext *C, PanelType *pt, uiLayout *layout, ui_block_add_dynamic_listener(block, pt->listener); } - /* This check may be paranoid, this function might run outside the context of a popup. */ - if (block->handle) { - /* Allow popovers to contain collapsible sections, see #uiItemPopoverPanel. */ - UI_popup_dummy_panel_set(block->handle->region, block); - } - uiLayout *last_item = static_cast<uiLayout *>(layout->items.last); ```

Jacques Lucke approved these changes 2024-03-22 17:06:30 +01:00

Dismissed

Jacques Lucke approved these changes 2024-03-22 17:06:40 +01:00

Guillermo Venegas commented

2024-03-22 17:07:11 +01:00

Support in popovers was added in: 02681bd44d

Support in popovers was added in: https://projects.blender.org/blender/blender/commit/02681bd44d285b51ffe9cf6d3df71af1980a6f70

Jacques Lucke commented

2024-03-22 17:08:52 +01:00

Will commit this fix first, because I'm a bit short on time. Feel free to create a separate PR for the extended functionality.

Jacques Lucke merged commit 7fabf0d896 into main

2024-03-22 17:09:12 +01:00

Jacques Lucke referenced this issue from a commit

2024-03-22 17:09:15 +01:00

Fix #119778: Crash in popovers that do not support refreshing

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #119778: Crash in popovers that do not support refreshing #119796