Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-10-15 12:27:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-10-15 12:27:04 +0300
commit871845b9793744f635750c830c52cb3f7ed1bcc8 (patch)
treee45fc7324f392786a87f3134794524f4f0d630d6
parent391b652be4caf45cfd0710cd787226c65013a83e (diff)
Fix T70433: No shortcut in tooltip for viewport X-Ray
While not a bug exactly, it's useful to show the shortcut, expose the operator in the UI instead of the property.
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 7d13c9c4112..137691c10ba 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -707,10 +707,18 @@ class VIEW3D_HT_header(Header):
row = layout.row()
row.active = (object_mode == 'EDIT') or (shading.type in {'WIREFRAME', 'SOLID'})
- if shading.type == 'WIREFRAME':
- row.prop(shading, "show_xray_wireframe", text="", icon='XRAY')
- else:
- row.prop(shading, "show_xray", text="", icon='XRAY')
+ # While exposing 'shading.show_xray(_wireframe)' is correct.
+ # this hides the key shortcut from users: T70433.
+ row.operator(
+ "view3d.toggle_xray",
+ text="",
+ icon='XRAY',
+ depress=getattr(
+ shading,
+ "show_xray_wireframe" if shading.type == 'WIREFRAME' else
+ "show_xray"
+ ),
+ )
row = layout.row(align=True)
row.prop(shading, "type", text="", expand=True)