blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

bl_app_override: support empty UI layout items 

Returning None from ui_ignore functions creates empty labels,
allows removing items without breaking layout in some cases.
This commit is contained in:
Campbell Barton 2017-12-08 12:48:12 +11:00 committed by Bastien Montagne
parent 5ab1897de7
commit 6d640504e8
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
release/scripts/modules/bl_app_override/__init__.py
View File

@ -77,7 +77,7 @@ def ui_draw_filter_register(
return UILayout_Fake(ret)
return dummy_func
elif attr in {"operator", "operator_menu_enum", "operator_enum"}:
elif attr in {"operator", "operator_menu_enum", "operator_enum", "operator_menu_hold"}:
if ui_ignore_operator is None:
return UILayout.__getattribute__(self, attr)
@ -85,10 +85,14 @@ def ui_draw_filter_register(
def dummy_func(*args, **kw):
# print("wrapped", attr)
if not ui_ignore_operator(args[0]):
ui_test = ui_ignore_operator(args[0])
if ui_test is False:
ret = real_func(*args, **kw)
else:
# UILayout.__getattribute__(self, "label")()
if ui_test is None:
UILayout.__getattribute__(self, "label")("")
else:
assert(ui_test is True)
# may need to be set
ret = OperatorProperties_Fake()
return ret
@ -102,9 +106,14 @@ def ui_draw_filter_register(
def dummy_func(*args, **kw):
# print("wrapped", attr)
if not ui_ignore_property(args[0].__class__.__name__, args[1]):
ui_test = ui_ignore_property(args[0].__class__.__name__, args[1])
if ui_test is False:
ret = real_func(*args, **kw)
else:
if ui_test is None:
UILayout.__getattribute__(self, "label")("")
else:
assert(ui_test is True)
ret = None
return ret
return dummy_func
@ -117,9 +126,14 @@ def ui_draw_filter_register(
def dummy_func(*args, **kw):
# print("wrapped", attr)
if not ui_ignore_menu(args[0]):
ui_test = ui_ignore_menu(args[0])
if ui_test is False:
ret = real_func(*args, **kw)
else:
if ui_test is None:
UILayout.__getattribute__(self, "label")("")
else:
assert(ui_test is True)
ret = None
return ret
return dummy_func
@ -132,10 +146,14 @@ def ui_draw_filter_register(
def dummy_func(*args, **kw):
# print("wrapped", attr)
if not ui_ignore_label(args[0] if args else kw.get("text", "")):
ui_test = ui_ignore_label(args[0] if args else kw.get("text", ""))
if ui_test is False:
ret = real_func(*args, **kw)
else:
# ret = real_func()
if ui_test is None:
real_func("")
else:
assert(ui_test is True)
ret = None
return ret
return dummy_func