From dd13bdb235513c4a061a8e05781c674eee8f5519 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:26:48 -0700 Subject: [PATCH 1/4] VectorDataWidget : Disable word wrap Back in the mists of time a Qt update caused paths displayed in VectorDataWidgets to be more aggressively elided when the path was longer than the widget could display. A path of `/a/longpath` would be elided to `/a/...` rather than `/a/long...`. We suspected some change in behaviour to how Qt was handling elided text, but early investigations proved to be not so fruitful, and the alternative of implementing `_StringDelegate.paint()` in Python didn't feel ideal for performance. It turns out that we were barking up the wrong tree there and the real issue was word wrapping. The path text was being wrapped before the text was elided. The wrapping considered '/' characters to be appropriate places to introduce line breaks, which are indicated with the same ellipses as elided text when the widget cannot display the additional line(s). Disabling word wrap on the VectorDataWidget's TableView allows the full path to be elided and we return to displaying `/a/long...` rather than `/a/...`. --- Changes.md | 3 +++ python/GafferUI/VectorDataWidget.py | 1 + 2 files changed, 4 insertions(+) diff --git a/Changes.md b/Changes.md index c795c434086..38ae6fd99b1 100644 --- a/Changes.md +++ b/Changes.md @@ -1,7 +1,10 @@ 1.3.16.x (relative to 1.3.16.7) ======== +Fixes +----- +- VectorDataWidget : Fixed bug causing paths to display as "..." after the last visible "/" when the widget wasn't wide enough to show the entire path. 1.3.16.7 (relative to 1.3.16.6) ======== diff --git a/python/GafferUI/VectorDataWidget.py b/python/GafferUI/VectorDataWidget.py index 7bc8bb57653..194d1f395bb 100644 --- a/python/GafferUI/VectorDataWidget.py +++ b/python/GafferUI/VectorDataWidget.py @@ -111,6 +111,7 @@ def __init__( self.__tableView.customContextMenuRequested.connect( Gaffer.WeakMethod( self.__contextMenu ) ) self.__tableView.verticalHeader().setDefaultSectionSize( 20 ) + self.__tableView.setWordWrap( False ) self.__tableViewHolder = GafferUI.Widget( self.__tableView ) self.__column.append( self.__tableViewHolder ) From 58ecdaed4a3dbb9e44e35c5f5376bd9cfc61ce83 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:44:50 -0700 Subject: [PATCH 2/4] Bump version to 1.3.16.8 --- Changes.md | 7 ++++++- SConstruct | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index 38ae6fd99b1..0fb7d99fc82 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,9 @@ -1.3.16.x (relative to 1.3.16.7) +1.3.16.x (relative to 1.3.16.8) +======== + + + +1.3.16.8 (relative to 1.3.16.7) ======== Fixes diff --git a/SConstruct b/SConstruct index b9b976f564a..3a851076d92 100644 --- a/SConstruct +++ b/SConstruct @@ -63,7 +63,7 @@ if codecs.lookup( locale.getpreferredencoding() ).name != "utf-8" : gafferMilestoneVersion = 1 # for announcing major milestones - may contain all of the below gafferMajorVersion = 3 # backwards-incompatible changes gafferMinorVersion = 16 # new backwards-compatible features -gafferPatchVersion = 7 # bug fixes +gafferPatchVersion = 8 # bug fixes gafferVersionSuffix = "" # used for alpha/beta releases : "a1", "b2", etc. # All of the following must be considered when determining From 15a6f05a8b68cfc2f5523c086604ccdf653a4ba4 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:54:24 -0700 Subject: [PATCH 3/4] Changes.md : Fix typo --- Changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 402723f7590..185cc4ac02a 100644 --- a/Changes.md +++ b/Changes.md @@ -4,7 +4,7 @@ Features -------- -- Viewer : Added support for Cycles GPU renderering via a new Device option in the Cycles viewer settings. +- Viewer : Added support for Cycles GPU rendering via a new Device option in the Cycles viewer settings. Improvements ------------ From 524253069b44f386380d4efa4b8e6d15540818a4 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:55:12 -0700 Subject: [PATCH 4/4] Bump version to 1.4.12.0 --- Changes.md | 7 ++++++- SConstruct | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index 185cc4ac02a..1d7f6cf9099 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,11 @@ -1.4.x.x (relative to 1.4.11.0) +1.4.x.x (relative to 1.4.12.0) ======= + + +1.4.12.0 (relative to 1.4.11.0) +======== + Features -------- diff --git a/SConstruct b/SConstruct index ff8c868e7e1..53fd100709e 100644 --- a/SConstruct +++ b/SConstruct @@ -63,7 +63,7 @@ if codecs.lookup( locale.getpreferredencoding() ).name != "utf-8" : gafferMilestoneVersion = 1 # for announcing major milestones - may contain all of the below gafferMajorVersion = 4 # backwards-incompatible changes -gafferMinorVersion = 11 # new backwards-compatible features +gafferMinorVersion = 12 # new backwards-compatible features gafferPatchVersion = 0 # bug fixes gafferVersionSuffix = "" # used for alpha/beta releases : "a1", "b2", etc.