[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48773] branches/soc-2012-bratwurst/source /blender: Add OPTYPE_CLEAR_SEARCH to an operator type to prevent a search panel built for that operator from automatically filling in the previous search .

Jorge Rodriguez bs.vino at gmail.com
Tue Jul 10 00:32:01 CEST 2012


Revision: 48773
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48773
Author:   vino
Date:     2012-07-09 22:32:00 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Add OPTYPE_CLEAR_SEARCH to an operator type to prevent a search panel built for that operator from automatically filling in the previous search.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c
    branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h
    branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c	2012-07-09 22:16:50 UTC (rev 48772)
+++ branches/soc-2012-bratwurst/source/blender/editors/object/object_group.c	2012-07-09 22:32:00 UTC (rev 48773)
@@ -393,7 +393,7 @@
 	ot->invoke = WM_enum_search_invoke;
 
 	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_CLEAR_SEARCH;
 
 	/* properties */
 	prop = RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", "");

Modified: branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h	2012-07-09 22:16:50 UTC (rev 48772)
+++ branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h	2012-07-09 22:32:00 UTC (rev 48773)
@@ -63,6 +63,7 @@
 								 * and don't make sense to be accessed from the
 								 * search menu, even if poll() returns TRUE.
 								 * currently only used for the search toolbox */
+#define OPTYPE_CLEAR_SEARCH	128 /* Clear the search bar text when opening a search box for this operator */
 
 /* context to call operator in for WM_operator_name_call */
 /* rna_ui.c contains EnumPropertyItem's of these, keep in sync */

Modified: branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c	2012-07-09 22:16:50 UTC (rev 48772)
+++ branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c	2012-07-09 22:32:00 UTC (rev 48773)
@@ -743,6 +743,9 @@
 	uiBut *but;
 	wmOperator *op = (wmOperator *)arg_op;
 
+	if (op->type->flag & OPTYPE_CLEAR_SEARCH)
+		search[0] = '\0';
+
 	block = uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
 	uiBlockSetFlag(block, UI_BLOCK_LOOP | UI_BLOCK_RET_1 | UI_BLOCK_MOVEMOUSE_QUIT);
 




More information about the Bf-blender-cvs mailing list