diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-27 02:23:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-27 02:23:54 +0400 |
commit | 0d84ac375e5d03602a7f5cbc12c4698d7b8fb58d (patch) | |
tree | cb3907b968e7629090712d63d016349b1ef02e63 /release | |
parent | 4eba521903add76db3e85fcfc18251c35abb531f (diff) |
more generic sorting of theme items by type (was adding all non color items last)
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/ui/space_userpref.py | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 96b422a3e0d..741e36142ff 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -495,34 +495,30 @@ class USERPREF_PT_theme(bpy.types.Panel): row = split.row() - subsplit = row.split(percentage=0.95) - - padding = subsplit.split(percentage=0.15) - colsub1 = padding.column() - colsub1 = padding.column() - + subsplit = row.split(percentage=0.95) + + padding1 = subsplit.split(percentage=0.15) + padding1.column() + subsplit = row.split(percentage=0.85) - - padding = subsplit.split(percentage=0.15) - colsub2 = padding.column() - colsub2 = padding.column() - props_color = [] - props_other = [] + padding2 = subsplit.split(percentage=0.15) + padding2.column() + + colsub_pair = padding1.column(), padding2.column() + + props_type = {} for i, prop in enumerate(themedata.rna_type.properties): attr = prop.identifier if attr == "rna_type": continue - if prop.subtype == 'COLOR': - props_color.append(prop.identifier) - else: - props_other.append(prop.identifier) + props_type.setdefault((prop.type, prop.subtype), []).append(prop.identifier) - for props_ls in props_color, props_other: + for props_type, props_ls in sorted(props_type.items()): for i, attr in enumerate(props_ls): - (colsub2 if i % 2 else colsub1).row().prop(themedata, attr) + colsub_pair[i % 2].row().prop(themedata, attr) def poll(self, context): userpref = context.user_preferences |