Skip to content

PlugLayout : "layout:accessory" fixes #6829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
murraystevenson wants to merge 2 commits into
base: 1.6_maintenance
Choose a base branch
from
Open

PlugLayout : "layout:accessory" fixes #6829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4696f2b
PlugLayout : Fix error when accessory metadata removed from widgets
murraystevenson Feb 28, 2026
d848e63
PlugLayout : Prevent dividers from being included in _AccessoryRow
murraystevenson Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ Improvements
- PlugPopup : Improved default popup title. Plugs and non-viewable nodes are no longer included in the title.
- Viewer : Added <kbd>D</kbd> hotkey for toggling between denoised and undenoised layers.

Fixes
-----

- PlugLayout :
- Fixed `Internal C++ object already deleted` errors when removing "layout:accessory" metadata from plugs currently visible in the Node Editor.
- Fixed layout issues when combining "layout:divider" and "layout:accessory" metadata.

API
---

Expand Down
20 changes: 16 additions & 4 deletions python/GafferUI/PlugLayout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,26 @@ def __updateLayout( self ) :
section = section.subsection( sectionName )

if len( section.widgets ) and self.__itemMetadataValue( item, "accessory" ) :
if isinstance( section.widgets[-1], _AccessoryRow ) :
section.widgets[-1].append( widget )
primaryIndex = -1
for i in range( len( section.widgets ) - 1, -1, -1 ) :
if not isinstance( section.widgets[i], GafferUI.Divider ) :
primaryIndex = i
break

if isinstance( section.widgets[primaryIndex], _AccessoryRow ) :
section.widgets[primaryIndex].append( widget )
else :
row = _AccessoryRow()
row.append( section.widgets[-1] )
row.append( section.widgets[primaryIndex] )
row.append( widget )
section.widgets[-1] = row
section.widgets[primaryIndex] = row
else :
parent = widget.parent()
if isinstance( parent, _AccessoryRow ) :
# Widget is no longer an accessory or no longer has an accessory, reparent to
# grandparent to prevent the widget from being deleted with the old _AccessoryRow.
parent.parent().addChild( widget )

section.widgets.append( widget )

if self.__itemMetadataValue( item, "divider" ) :
Expand Down