[Bf-blender-cvs] [3d99c718376] soc-2019-outliner: Outliner: Clear search on creation of merged element search menu

Nathan Craddock noreply at git.blender.org
Fri Jul 19 21:57:05 CEST 2019


Commit: 3d99c71837691522c6103c38969064f8f88688b4
Author: Nathan Craddock
Date:   Fri Jul 19 10:56:18 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rB3d99c71837691522c6103c38969064f8f88688b4

Outliner: Clear search on creation of merged element search menu

Rather than showing the last searched or selected element name
in the search button, clear each time the menu is created so
all the items are shown by default.

===================================================================

M	source/blender/editors/space_outliner/outliner_select.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 748fae63ba4..de7e3da538d 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1400,7 +1400,7 @@ static void merged_element_search_cb_recursive(const ListBase *tree,
   }
 }
 
-static void merged_element_search_cb(const bContext *C,
+static void merged_element_search_cb(const bContext *UNUSED(C),
                                      void *element,
                                      const char *str,
                                      uiSearchItems *items)
@@ -1411,11 +1411,8 @@ static void merged_element_search_cb(const bContext *C,
   merged_element_search_cb_recursive(&te->parent->subtree, type, str, items);
 }
 
-static void merged_element_search_call_cb(struct bContext *C, void *arg1, void *arg2)
+static void merged_element_search_call_cb(struct bContext *C, void *UNUSED(arg1), void *arg2)
 {
-  char search = (char *)arg1;
-  search = "";
-
   TreeElement *te = (TreeElement *)arg2;
 
   outliner_item_do_activate_from_tree_element(C, te, te->store_elem, false, false);
@@ -1427,6 +1424,9 @@ static uiBlock *merged_element_search_menu(bContext *C, ARegion *ar, void *eleme
   uiBlock *block;
   uiBut *but;
 
+  /* Clear search on each menu creation */
+  *search = '\0';
+
   short menuwidth = 10 * UI_UNIT_X;
 
   block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
@@ -1438,7 +1438,7 @@ static uiBlock *merged_element_search_menu(bContext *C, ARegion *ar, void *eleme
   but = uiDefSearchBut(
       block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, menuwidth, UI_UNIT_Y, 0, 0, "");
   UI_but_func_search_set(
-      but, NULL, merged_element_search_cb, te, false, merged_element_search_call_cb, search);
+      but, NULL, merged_element_search_cb, te, false, merged_element_search_call_cb, NULL);
   UI_but_flag_enable(but, UI_BUT_ACTIVATE_ON_INIT);
 
   /* fake button, it holds space for search items */



More information about the Bf-blender-cvs mailing list