[Bf-blender-cvs] [27972c4225c] master: UI: Don't expand bevel active tool setting

[Hans Goudey]

Commit: 27972c4225c26780eb957ddf0c98ce4cee3d29e5
Author: Hans Goudey
Date:   Tue Jun 23 10:16:28 2020 -0400
Branches: master
https://developer.blender.org/rB27972c4225c26780eb957ddf0c98ce4cee3d29e5

UI: Don't expand bevel active tool setting

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index bfd5be8862d..52c59431316 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -738,10 +738,11 @@ class _defs_edit_mesh:
     def bevel():
         def draw_settings(context, layout, tool, *, extra=False):
             props = tool.operator_properties("mesh.bevel")
-            region_type = context.region.type
+
+            region_is_header = context.region.type == 'TOOL_HEADER'
 
             if not extra:
-                if region_type == 'TOOL_HEADER':
+                if region_is_header:
                     layout.prop(props, "offset_type", text="")
                 else:
                     layout.prop(props, "offset_type")
@@ -749,11 +750,11 @@ class _defs_edit_mesh:
                 layout.prop(props, "segments")
 
                 row = layout.row()
-                row.prop(props, "profile_type", expand=True)
+                row.prop(props, "profile_type", text="" if region_is_header else None)
                 if props.profile_type == 'SUPERELLIPSE':
                     layout.prop(props, "profile", text="Shape", slider=True)
 
-                if region_type == 'TOOL_HEADER':
+                if region_is_header:
                     layout.popover("TOPBAR_PT_tool_settings_extra", text="...")
                 else:
                     extra = True