Drop the ColumnLimit to 80 for clang-format

This gives better support for smaller screens and side-by-side windows. Also standardize the formatting check on GitHub on version 17. Diffs= e52e9fff29 Drop the ColumnLimit to 80 for clang-format (#8320) Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
rive-app · Oct 11, 2024 · 6a08a8f · 6a08a8f
1 parent 58f66ff
commit 6a08a8f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.rive_head b/.rive_head
@@ -1 +1 @@
-52913023ba59036aa8f96685f1df5d9173551f72
+e52e9fff2973ce63a689e9d11ea283214109ca18
diff --git a/wasm/src/skia_imports/include/core/SkScalar.h b/wasm/src/skia_imports/include/core/SkScalar.h
@@ -105,7 +105,7 @@ static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; }
 
 #define SkScalarInvert(x) sk_ieee_float_divide_TODO_IS_DIVIDE_BY_ZERO_SAFE_HERE(SK_Scalar1, (x))
 #define SkScalarAve(a, b) (((a) + (b)) * SK_ScalarHalf)
-#define SkScalarHalf(a) ((a)*SK_ScalarHalf)
+#define SkScalarHalf(a) ((a) * SK_ScalarHalf)
 
 #define SkDegreesToRadians(degrees) ((degrees) * (SK_ScalarPI / 180))
 #define SkRadiansToDegrees(radians) ((radians) * (180 / SK_ScalarPI))

diff --git a/wasm/src/skia_imports/include/core/SkTypes.h b/wasm/src/skia_imports/include/core/SkTypes.h
@@ -476,7 +476,8 @@ SK_API void SkDebugf(const char format[], ...) SK_PRINTF_LIKE(1, 2);
 // The if is present so that this can be used with functions marked SK_WARN_UNUSED_RESULT.
 #define SkAssertResult(cond)                                                                       \
     if (cond)                                                                                      \
-    {}                                                                                             \
+    {                                                                                              \
+    }                                                                                              \
     do                                                                                             \
     {                                                                                              \
     } while (false)

diff --git a/wasm/submodules/rive-runtime b/wasm/submodules/rive-runtime
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		52913023ba59036aa8f96685f1df5d9173551f72
		e52e9fff2973ce63a689e9d11ea283214109ca18