Page MenuHome
Differential D8880

UI: Add icon_only argument to operator_enum
ClosedPublic
Actions

Authored by Nathan Craddock (natecraddock) on Sep 13 2020, 4:27 AM.

Details

Reviewers
Julian Eisel (Severin)
Maniphest Tasks
T77408: Continued Outliner Improvements Design
Commits
rB93b8040f5729: UI: Add `icon_only` argument to operator_enum
Summary

Adds an argument to draw only icons in operator_enum menus. This is useful for drawing inline icons in the outliner context menu for collection color tagging.

Diff Detail

Repository
rB Blender

Event Timeline

Nathan Craddock (natecraddock) requested review of this revision.Sep 13 2020, 4:27 AM
Nathan Craddock (natecraddock) created this revision.
Harbormaster completed remote builds in B10159: Diff 28809.Sep 13 2020, 4:27 AM
Nathan Craddock (natecraddock) added a reviewer: Julian Eisel (Severin).Sep 13 2020, 4:28 AM
Nathan Craddock (natecraddock) added projects: User Interface, Restricted Project.
Nathan Craddock (natecraddock) mentioned this in D8317: UI: Fix drawing of aligned icon buttons in menu rows.Sep 13 2020, 4:31 AM
Julian Eisel (Severin) requested changes to this revision.Sep 14 2020, 9:53 PM

Usually we convert the BPY options like icon_only into flags right in RNA. So rather than calling uiItemsEnumO() directly, there could be a rna_uiItemsEnumO() that does this + additional sanity checks. See uiItemO() and rna_uiItemO(). I would do this for the sake of consistency.

Also see my last comment in D8317. Other than that, this patch is ready I think.

source/blender/editors/interface/interface_layout.c
1524

split may be used uninitialized here. I think just NULL-checking is fine.

This revision now requires changes to proceed.Sep 14 2020, 9:53 PM
Nathan Craddock (natecraddock) updated this revision to Diff 28859.Sep 15 2020, 5:16 AM
Nathan Craddock (natecraddock) marked an inline comment as done.
  • Add null-check for split layout
Harbormaster completed remote builds in B10194: Diff 28859.Sep 15 2020, 5:16 AM
Nathan Craddock (natecraddock) updated this revision to Diff 28860.Sep 15 2020, 5:44 AM
  • Add rna_uiItemsEnumO function
  • Move uiItemsEnumO icon_only to rna
Harbormaster completed remote builds in B10195: Diff 28860.Sep 15 2020, 5:44 AM
Nathan Craddock (natecraddock) added a comment.Sep 15 2020, 5:45 AM

I believe I've got it working as expected now with the RNA function.

Julian Eisel (Severin) accepted this revision.Sep 15 2020, 1:08 PM
Julian Eisel (Severin) added inline comments.
source/blender/makesrna/intern/rna_ui_api.c
354–358

Ah sorry, I just noticed that uiItemsFullEnumO() (called by uiItemsEnumO()) already does these sanity checks.
So you can just set the flag value here and call uiItemsFullEnumO() directly, using uiLayoutGetOperatorContext() to get the context parameter. No need for doing the sanity checks right in RNA then.

This revision is now accepted and ready to land.Sep 15 2020, 1:08 PM
Julian Eisel (Severin) added a task: T77408: Continued Outliner Improvements Design.Sep 15 2020, 1:09 PM
Nathan Craddock (natecraddock) updated this revision to Diff 28872.Sep 15 2020, 3:35 PM
  • Simplify RNA uiItemsEnumO
Harbormaster completed remote builds in B10204: Diff 28872.Sep 15 2020, 3:35 PM
Nathan Craddock (natecraddock) marked an inline comment as done.Sep 15 2020, 3:37 PM

Ah sorry, I just noticed that uiItemsFullEnumO() (called by uiItemsEnumO()) already does these sanity checks.

I should have looked a bit deeper rather than blindly trusting your suggestions :)

Julian Eisel (Severin) accepted this revision.Sep 15 2020, 3:39 PM
Closed by commit rB93b8040f5729: UI: Add `icon_only` argument to operator_enum (authored by Nathan Craddock (natecraddock)). · Explain WhySep 15 2020, 3:43 PM
This revision was automatically updated to reflect the committed changes.
Nathan Craddock (natecraddock) added a commit: rB93b8040f5729: UI: Add `icon_only` argument to operator_enum.

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
animation/
2 lines
2 lines
curve/
2 lines
gpencil/
2 lines
include/
2 lines
interface/
21 lines
2 lines
space_info/
2 lines
space_outliner/
2 lines
transform/
2 lines
makesrna/
intern/
12 lines

Diff 28873

View Options

source/blender/editors/animation/keyframing.c

Loading...
View Options

source/blender/editors/animation/keyingsets.c

Loading...
View Options

source/blender/editors/curve/editcurve.c

Loading...
View Options

source/blender/editors/gpencil/gpencil_data.c

Loading...
View Options

source/blender/editors/include/UI_interface.h

Loading...
View Options

source/blender/editors/interface/interface_layout.c

Loading...
View Options

source/blender/editors/interface/interface_region_menu_pie.c

Loading...
View Options

source/blender/editors/space_info/info_ops.c

Loading...
View Options

source/blender/editors/space_outliner/outliner_tools.c

Loading...
View Options

source/blender/editors/transform/transform_ops.c

Loading...
View Options

source/blender/makesrna/intern/rna_ui_api.c

Loading...