scripts/startup/bl_ui/asset_shelf.py

@@ -7,7 +7,8 @@ from bpy.types import (
 
 class ASSETSHELF_PT_display(Panel):
     bl_label = "Display Settings"
-    bl_space_type = 'PREFERENCES'
+    # Doesn't actually matter. Panel is instanced through popover only.
+    bl_space_type = 'VIEW_3D'
     bl_region_type = 'HEADER'
 
     def draw(self, context):

scripts/startup/bl_ui/space_userpref.py

@@ -1165,7 +1165,8 @@ class PreferenceThemeSpacePanel:
 
     @classmethod
     def poll(cls, context):
-        # Special exception for expeimental asset shelf.
+        # Special exception for expeimental asset shelf: Hide theme settings if
+        # experimental option is disabled.
         if cls.datapath.endswith(".asset_shelf"):
             prefs = context.preferences
             return prefs.experimental.use_asset_shelf

source/blender/editors/include/UI_interface.hh

@@ -34,6 +34,7 @@ struct uiViewHandle;
 struct uiViewItemHandle;
 struct wmDrag;
 
+void UI_but_func_set(uiBut *but, std::function<void(bContext &)> func);
 void UI_but_func_pushed_state_set(uiBut *but, std::function<bool(const uiBut &)> func);
 
 namespace blender::ui {
@@ -183,9 +184,6 @@ void UI_list_filter_and_sort_items(uiList *ui_list,
                                    const char *propname,
                                    uiListItemGetNameFn get_name_fn = nullptr);
 
-void UI_but_func_set(uiBut *but, std::function<void(bContext &)> func);
-void UI_but_func_pushed_state_set(uiBut *but, std::function<bool(const uiBut &)> func);
-
 /**
  * Override this for all available view types.
  */