kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

PyAPI: Use 'None' arg to clear header text

Browse Source
This commit is contained in:
Campbell Barton 2018-10-30 16:16:41 +11:00
parent f711c44b8d
commit f907eb4268
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/wm.py
View File

@ -837,12 +837,12 @@ class WM_OT_context_modal_mouse(Operator):
elif 'LEFTMOUSE' == event_type: elif 'LEFTMOUSE' == event_type:
item = next(iter(self._values.keys())) item = next(iter(self._values.keys()))
self._values_clear() self._values_clear()
context.area.header_text_set("") context.area.header_text_set(None)
return operator_value_undo_return(item) return operator_value_undo_return(item)
elif event_type in {'RIGHTMOUSE', 'ESC'}: elif event_type in {'RIGHTMOUSE', 'ESC'}:
self._values_restore() self._values_restore()
context.area.header_text_set("") context.area.header_text_set(None)
return {'CANCELLED'} return {'CANCELLED'}
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

2
release/scripts/templates_py/gizmo_custom_geometry.py
View File

@ -96,7 +96,7 @@ class MyCustomShapeWidget(Gizmo):
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}
def exit(self, context, cancel): def exit(self, context, cancel):
context.area.header_text_set("") context.area.header_text_set(None)
if cancel: if cancel:
self.target_set_value("offset", self.init_value) self.target_set_value("offset", self.init_value)

4
release/scripts/templates_py/operator_modal_view3d.py
View File

@ -29,12 +29,12 @@ class ViewOperator(bpy.types.Operator):
context.area.header_text_set("Offset %.4f %.4f %.4f" % tuple(self.offset)) context.area.header_text_set("Offset %.4f %.4f %.4f" % tuple(self.offset))
elif event.type == 'LEFTMOUSE': elif event.type == 'LEFTMOUSE':
context.area.header_text_set("") context.area.header_text_set(None)
return {'FINISHED'} return {'FINISHED'}
elif event.type in {'RIGHTMOUSE', 'ESC'}: elif event.type in {'RIGHTMOUSE', 'ESC'}:
rv3d.view_location = self._initial_location rv3d.view_location = self._initial_location
context.area.header_text_set("") context.area.header_text_set(None)
return {'CANCELLED'} return {'CANCELLED'}
return {'RUNNING_MODAL'} return {'RUNNING_MODAL'}

3
source/blender/makesrna/intern/rna_screen.c
View File

@ -332,8 +332,9 @@ static void rna_def_area_api(StructRNA *srna)
func = RNA_def_function(srna, "header_text_set", "ED_area_status_text"); func = RNA_def_function(srna, "header_text_set", "ED_area_status_text");
RNA_def_function_ui_description(func, "Set the header status text"); RNA_def_function_ui_description(func, "Set the header status text");
parm = RNA_def_string(func, "text", NULL, 0, "Text", "New string for the header, empty string clears the text"); parm = RNA_def_string(func, "text", NULL, 0, "Text", "New string for the header, None clears the text");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_property_clear_flag(parm, PROP_NEVER_NULL);
} }
static void rna_def_area(BlenderRNA *brna) static void rna_def_area(BlenderRNA *brna)

3
source/blender/makesrna/intern/rna_workspace_api.c
View File

@ -176,8 +176,9 @@ void RNA_api_workspace(StructRNA *srna)
func = RNA_def_function(srna, "status_text_set", "ED_workspace_status_text"); func = RNA_def_function(srna, "status_text_set", "ED_workspace_status_text");
RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
RNA_def_function_ui_description(func, "Set the status bar text, typically key shortcuts for modal operators"); RNA_def_function_ui_description(func, "Set the status bar text, typically key shortcuts for modal operators");
parm = RNA_def_string(func, "text", NULL, 0, "Text", "New string for the status bar, empty string clears the text"); parm = RNA_def_string(func, "text", NULL, 0, "Text", "New string for the status bar, None clears the text");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
RNA_def_property_clear_flag(parm, PROP_NEVER_NULL);
} }
void RNA_api_workspace_tool(StructRNA *srna) void RNA_api_workspace_tool(StructRNA *srna)