From 871845b9793744f635750c830c52cb3f7ed1bcc8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 Oct 2019 20:27:04 +1100 Subject: [PATCH] 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. --- release/scripts/startup/bl_ui/space_view3d.py | 16 ++++++++++++---- 1 file 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)