Skip to content

refactor(spi): use OpenRenderBox path shims #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 1 commit into from
Sep 26, 2026
Merged

refactor(spi): use OpenRenderBox path shims #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions Sources/OpenSwiftUI_SPI/Overlay/CoreGraphics/CGPath+OpenSwiftUI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@
#import <CoreGraphics/CoreGraphics.h>
#import <xlocale.h>

#if OPENSWIFTUI_RENDERBOX
#include <RenderBox/RenderBox.h>
#else
#include <OpenRenderBox/OpenRenderBox.h>
#endif
#include <OpenRenderBoxShims/OpenRenderBoxShims.h>

BOOL _CGPathParseString(CGMutablePathRef path, const char *utf8CString) {
double numbers[6];
Expand Down Expand Up @@ -228,17 +224,10 @@ CGPathRef _CGPathCreateRoundedRect(CGRect rect, CGFloat cornerWidth, CGFloat cor
}

if (style == PathRoundedCornerStyleContinuous) {
#if OPENSWIFTUI_RENDERBOX
RBPath rbPath = RBPathMakeRoundedRect(rect, cornerWidth, cornerHeight, RBPathRoundedCornerStyleContinuous, NULL);
CGPathRef cgPath = RBPathCopyCGPath(rbPath);
RBPathRelease(rbPath);
return cgPath;
#else
ORBPath rbPath = ORBPathMakeRoundedRect(rect, cornerWidth, cornerHeight, ORBPathRoundedCornerStyleContinuous, NULL);
CGPathRef cgPath = ORBPathCopyCGPath(rbPath);
ORBPathRelease(rbPath);
return cgPath;
#endif
}

// Use CoreGraphics path creation (circular style)
Expand Down
10 changes: 1 addition & 9 deletions Sources/OpenSwiftUI_SPI/Util/PathData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
#include <CoreGraphics/CoreGraphics.h>
#endif

#if OPENSWIFTUI_RENDERBOX
#include <RenderBox/RenderBox.h>
#else
#include <OpenRenderBox/OpenRenderBox.h>
#endif
#include <OpenRenderBoxShims/OpenRenderBoxShims.h>

OPENSWIFTUI_ASSUME_NONNULL_BEGIN

Expand All @@ -27,11 +23,7 @@ typedef union PathData {
#if OPENSWIFTUI_TARGET_OS_DARWIN
CGPathRef cgPath;
#endif
#if OPENSWIFTUI_RENDERBOX
RBPath rbPath;
#else
ORBPath rbPath;
#endif
uint8_t buffer[0x60];
} PathData;

Expand Down
Loading