[Bf-blender-cvs] [da101eddef0] master: UI: input preferences layout tweaks for keymap search and zoom settings

[Yevgeny Makarov]

Commit: da101eddef02ccdb8f2cb4735343f6c0070ca3b3
Author: Yevgeny Makarov
Date:   Mon Mar 9 16:54:38 2020 +0100
Branches: master
https://developer.blender.org/rBda101eddef02ccdb8f2cb4735343f6c0070ca3b3

UI: input preferences layout tweaks for keymap search and zoom settings

Differential Revision: https://developer.blender.org/D6979

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

M	release/scripts/modules/rna_keymap_ui.py
M	release/scripts/startup/bl_ui/space_userpref.py

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

diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index 30170e34bfa..22be5186186 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -390,7 +390,7 @@ def draw_keymaps(context, layout):
 
     # layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
     # row.operator("preferences.keyconfig_remove", text="", icon='X')
-    rowsub = row.split(factor=0.3, align=True)
+    rowsub = row.split(factor=0.4, align=True)
     # postpone drawing into rowsub, so we can set alert!
 
     layout.separator()
@@ -405,7 +405,8 @@ def draw_keymaps(context, layout):
         ok = True
 
     # go back and fill in rowsub
-    rowsub.prop(spref, "filter_type", text="")
+    rowsubsub = rowsub.row(align=True)
+    rowsubsub.prop(spref, "filter_type", expand=True)
     rowsubsub = rowsub.row(align=True)
     if not ok:
         rowsubsub.alert = True
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index b8051a1d98a..77e642f5e1f 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1470,9 +1470,9 @@ class USERPREF_PT_navigation_zoom(NavigationPanel, CenterAlignMixIn, Panel):
 
         flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
 
-        flow.row().prop(inputs, "view_zoom_method", text="Zoom Method", expand=True)
+        flow.row().prop(inputs, "view_zoom_method", text="Zoom Method")
         if inputs.view_zoom_method in {'DOLLY', 'CONTINUE'}:
-            flow.row().prop(inputs, "view_zoom_axis", expand=True)
+            flow.row().prop(inputs, "view_zoom_axis")
             flow.prop(inputs, "invert_mouse_zoom", text="Invert Mouse Zoom Direction")
 
         flow.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction")