Skip to content

Commit

Permalink
Merge pull request #6019 from murraystevenson/inspectorColumnUI
Browse files Browse the repository at this point in the history
InspectorColumnUI
  • Loading branch information
murraystevenson authored Sep 4, 2024
2 parents dca18f5 + a61490d commit e1d7145
Show file tree
Hide file tree
Showing 11 changed files with 526 additions and 697 deletions.
2 changes: 2 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Fixes
- Fixed error when `resize()` removed plugs with input connections.
- Fixed error when `resize()` was used on an output plug.
- CreateViews : Fixed redundant serialisation of internal connections.
- LightEditor, RenderPassEditor : Removed ambiguous `The selected cells cannot be edited in the current Edit Scope` message when attempting to edit non-editable columns, such as the `Name` column.

API
---
Expand All @@ -56,6 +57,7 @@ API
- PathColumn :
- Added `contextMenuSignal()`, allowing the creation of custom context menus.
- Added `instanceCreatedSignal()`, providing an opportunity to connect to the signals on _any_ column, no matter how it is created.
- Added `keyPressSignal()` and `keyReleaseSignal()`, allowing a PathColumn to handle key events.
- ArrayPlug :
- It is now legal to construct an ArrayPlug with a minimum size of 0. Previously the minimum size was 1.
- Added `elementPrototype()` method.
Expand Down
7 changes: 7 additions & 0 deletions include/GafferUI/PathColumn.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "GafferUI/ButtonEvent.h"
#include "GafferUI/EventSignalCombiner.h"
#include "GafferUI/Export.h"
#include "GafferUI/KeyEvent.h"

#include "Gaffer/Path.h"

Expand Down Expand Up @@ -167,6 +168,10 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
/// To retain `widget` for use in MenuItem commands, use `PathListingWidgetPtr( &widget )`.
ContextMenuSignal &contextMenuSignal();

using KeySignal = Gaffer::Signals::Signal<bool ( PathColumn &column, PathListingWidget &widget, const KeyEvent &key ), EventSignalCombiner<bool>>;
KeySignal &keyPressSignal();
KeySignal &keyReleaseSignal();

/// Creation
/// ========

Expand All @@ -183,6 +188,8 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
ButtonSignal m_buttonReleaseSignal;
ButtonSignal m_buttonDoubleClickSignal;
ContextMenuSignal m_contextMenuSignal;
KeySignal m_keyPressSignal;
KeySignal m_keyReleaseSignal;

SizeMode m_sizeMode;

Expand Down
Loading

0 comments on commit e1d7145

Please sign in to comment.