diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_userpref.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 7c6a7ecbcee..ab4d54f039e 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1409,20 +1409,24 @@ class USERPREF_PT_saveload_file_browser(PreferencePanel, Panel): flow.prop(paths, "hide_system_bookmarks") -class USERPREF_MT_ndof_settings(Menu): - # accessed from the window key-bindings in C (only) +class USERPREF_PT_ndof_settings(Panel): bl_label = "3D Mouse Settings" + bl_space_type = 'TOPBAR' # dummy. + bl_region_type = 'HEADER' def draw(self, context): layout = self.layout + layout.use_property_split = True + layout.use_property_decorate = False # No animation. input_prefs = context.preferences.inputs is_view3d = context.space_data.type == 'VIEW_3D' - layout.prop(input_prefs, "ndof_sensitivity") - layout.prop(input_prefs, "ndof_orbit_sensitivity") - layout.prop(input_prefs, "ndof_deadzone") + col = layout.column(align=True) + col.prop(input_prefs, "ndof_sensitivity") + col.prop(input_prefs, "ndof_orbit_sensitivity") + col.prop(input_prefs, "ndof_deadzone") if is_view3d: layout.separator() @@ -1430,8 +1434,8 @@ class USERPREF_MT_ndof_settings(Menu): layout.separator() layout.label(text="Orbit Style") - layout.row().prop(input_prefs, "ndof_view_navigate_method", text="") - layout.row().prop(input_prefs, "ndof_view_rotate_method", text="") + layout.row().prop(input_prefs, "ndof_view_navigate_method", text="Navigate") + layout.row().prop(input_prefs, "ndof_view_rotate_method", text="Orbit") layout.separator() layout.label(text="Orbit Options") layout.prop(input_prefs, "ndof_rotx_invert_axis") @@ -2255,7 +2259,6 @@ classes = ( USERPREF_PT_saveload_autorun, USERPREF_PT_saveload_file_browser, - USERPREF_MT_ndof_settings, USERPREF_MT_keyconfigs, USERPREF_PT_input_keyboard, @@ -2278,6 +2281,9 @@ classes = ( USERPREF_PT_experimental_all, + # Popovers. + USERPREF_PT_ndof_settings, + # Add dynamically generated editor theme panels last, # so they show up last in the theme section. *ThemeGenericClassGenerator.generate_panel_classes_from_theme_areas(), |