Merge branch '1.2_maintenance' into 1.3_maintenance

GafferHQ · Sep 25, 2023 · 4ce2612 · 4ce2612
2 parents 1332d5e + 1e465b0
commit 4ce2612
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Changes.md b/Changes.md
@@ -9,6 +9,11 @@ Improvements
   - The default purposes can be specified in a startup file using `Gaffer.Metadata.registerValue( GafferSceneUI.SceneView, "drawingMode.includedPurposes.value", "userDefault", IECore.StringVectorData( [ "default", "proxy" ] ) )`.
 - StandardOptions : Added `includedPurposes` plug, to control which locations are included in a render based on the value of their `usd:purpose` attribute.
 
+Fixes
+-----
+
+- GraphEditor : Removed dynamic raster-space sizing of focus icon, as it caused excessive overlap with other nodes at certain zoom levels and on certain high resolution displays (#5435).
+
 API
 ---
 
@@ -392,6 +397,10 @@ Build
 1.2.10.x (relative to 1.2.10.3)
 ========
 
+Fixes
+-----
+
+- GraphEditor : Removed dynamic raster-space sizing of focus icon, as it caused excessive overlap with other nodes at certain zoom levels and on certain high resolution displays (#5435).
 
 1.2.10.3 (relative to 1.2.10.2)
 ========

diff --git a/src/GafferUI/StandardNodeGadget.cpp b/src/GafferUI/StandardNodeGadget.cpp
@@ -778,12 +778,7 @@ void StandardNodeGadget::renderLayer( Layer layer, const Style *style, RenderRea
 
 float StandardNodeGadget::focusBorderWidth() const
 {
-	// Compute a fixed size in raster space, clamped to a maximum
-	const ViewportGadget *viewport = ancestor<ViewportGadget>();
-	const V3f p0 = viewport->rasterToGadgetSpace( V2f( 0 ), this ).p0;
-	const V3f p1 = viewport->rasterToGadgetSpace( V2f( 0, 1.0f ), this ).p0;
-	float pixelSize = ( p0 - p1 ).length();
-	return min( g_maxFocusWidth, max( 0.75f, 8.0f * pixelSize ) );
+	return 0.8;
 }
 
 void StandardNodeGadget::setHighlighted( bool highlighted )