Skip to content

Commit

Permalink
Pass scaleType down to sizeable children
Browse files Browse the repository at this point in the history 
Passing scaleType down to Layout sizeable children fixes a bug we were seeing where layout components hugging text objects set to autoWidth would sometimes inadvertently wrap when animation occurs that changes computed text bounds width. This was because once the Layout pushes a size down to Text.controlSize, the effectiveSize returned becomes fixed. This can conflict with the size we measured previously because we measured when the effectiveSize was autoWidth, causing a text wrap flicker until it corrects itself.

Had to change the API so several files were affected, but only Text currently uses the scaleType values.

Before:

https://github.com/user-attachments/assets/34b495ca-edf3-4b27-a7bb-dc69f16517df

After:

https://github.com/user-attachments/assets/c55bc14b-2809-4ce3-81aa-fc59e245a4b7

Diffs=
97050e4fa7 Pass scaleType down to sizeable children (#8524)
  • Loading branch information
philter committed Nov 9, 2024
1 parent 7c4870f commit 4564361
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .rive_head
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
071b19ba62ea97db039f71dcab264d4934161db4
97050e4fa782efe750965b5fe20b13afd591abc9
2 changes: 1 addition & 1 deletion submodules/rive-runtime
Submodule rive-runtime updated 15 files
+1 −1 .rive_head
+5 −1 include/rive/intrinsically_sizeable.hpp
+3 −1 include/rive/joystick.hpp
+3 −1 include/rive/layout/n_sliced_node.hpp
+3 −1 include/rive/nested_artboard.hpp
+3 −1 include/rive/shapes/image.hpp
+3 −1 include/rive/shapes/parametric_path.hpp
+5 −4 include/rive/text/text.hpp
+3 −1 src/joystick.cpp
+3 −1 src/layout/n_sliced_node.cpp
+6 −2 src/layout_component.cpp
+4 −1 src/nested_artboard.cpp
+3 −1 src/shapes/image.cpp
+3 −1 src/shapes/parametric_path.cpp
+17 −8 src/text/text.cpp

0 comments on commit 4564361

Please sign in to comment.