diff options
author | Fabian Schempp <fabianschempp@googlemail.com> | 2021-06-25 08:57:24 +0300 |
---|---|---|
committer | Fabian Schempp <fabianschempp@googlemail.com> | 2021-06-25 08:57:24 +0300 |
commit | ae085e301c2aac0d6956609bfe93a90a19f0e235 (patch) | |
tree | 38b86749807915a6b6d46504a2acb90e41a4a77a /release | |
parent | 841df831e89dfc4011c323203c2efb8265dc1878 (diff) |
Spreadsheet: Dataset region for spreadsheet editor
This patch adds a left aligned sidebar to the spreadsheet editor. This
Sidebar can be used to navigate the geometry component types and
attribute domains. It also provides a quick overview of domain sizes.
It replaces the two dropdowns in the regions header.
Next step will be to add the domain cycling shortcut
using the CTRL + mouse wheel.
Reviewer: Dalai Felinto (dfelinto), Julian Eisel (Severin),
Hans Goudey (HooglyBoogly).
Differential Revision: https://developer.blender.org/D11046
Diffstat (limited to 'release')
4 files changed, 28 insertions, 5 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 48e675492f9..441a92127ea 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -1041,6 +1041,11 @@ const bTheme U_theme_default = { .active_object = RGBA(0xffaf29ff), .edited_object = RGBA(0x00806266), .row_alternate = RGBA(0xffffff07), + .list = RGBA(0x424242ff), + .list_title = RGBA(0xc3c3c3ff), + .list_text = RGBA(0xc3c3c3ff), + .list_text_hi = RGBA(0xffffff), + .hilite = RGBA(0x80808080), }, .tarm = { { diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index bd14b2c532c..7f1039a975b 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -187,7 +187,7 @@ def _template_items_context_panel(menu, key_args_primary): ] -def _template_space_region_type_toggle(*, toolbar_key=None, sidebar_key=None): +def _template_space_region_type_toggle(*, toolbar_key=None, sidebar_key=None, channels_key=None): items = [] if toolbar_key is not None: items.append( @@ -199,6 +199,12 @@ def _template_space_region_type_toggle(*, toolbar_key=None, sidebar_key=None): ("wm.context_toggle", sidebar_key, {"properties": [("data_path", 'space_data.show_region_ui')]}), ) + if channels_key is not None: + items.append( + ("wm.context_toggle", channels_key, + {"properties": [("data_path", 'space_data.show_region_channels')]}), + ) + return items @@ -3021,6 +3027,7 @@ def km_spreadsheet_generic(_params): items.extend([ *_template_space_region_type_toggle( sidebar_key={"type": 'N', "value": 'PRESS'}, + channels_key={"type": 'T', "value": 'PRESS'}, ), ]) diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index e56783fcc21..b0144672745 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -2143,6 +2143,21 @@ def km_clip_dopesheet_editor(_params): return keymap +def km_spreadsheet_generic(_params): + items = [] + keymap = ( + "Spreadsheet Generic", + {"space_type": 'SPREADSHEET', "region_type": 'WINDOW'}, + {"items": items}, + ) + + items.extend([ + *_template_space_region_type_toggle( + channels_key={"type": 'T', "value": 'PRESS'}, + ), + ]) + + return keymap # ------------------------------------------------------------------------------ # Animation diff --git a/release/scripts/startup/bl_ui/space_spreadsheet.py b/release/scripts/startup/bl_ui/space_spreadsheet.py index 360849a0c7a..178be9ef0b7 100644 --- a/release/scripts/startup/bl_ui/space_spreadsheet.py +++ b/release/scripts/startup/bl_ui/space_spreadsheet.py @@ -41,10 +41,6 @@ class SPREADSHEET_HT_header(bpy.types.Header): return layout.prop(space, "object_eval_state", text="") - if space.object_eval_state != 'ORIGINAL': - layout.prop(space, "geometry_component_type", text="") - if space.geometry_component_type != 'INSTANCES': - layout.prop(space, "attribute_domain", text="") context_path = space.context_path if space.object_eval_state == 'ORIGINAL': |