Skip to content

Commit

Permalink
Working on option C for update cycle
Browse files Browse the repository at this point in the history
https://2dimensions.slack.com/archives/C078KG6KAJY/p1729359775985179

Diffs=
aa20d8aad4 Working on option C for update cycle (#8409)
1d5a580041 Layout Fixes (#8468)
d60ea4cc71 Use imageAsset size for layout (#8462)
f5e5406185 Fix inconsistent layout overflow behavior (#8463)
ce39f8be9f Artboard object validation (#8464)
bdb9eb01db search for ios sysroot only when necessary (#8437)
91d092f4fc runtime: add support for gradients in vector n-slicer (#8447)
5a4418dba6 Add an experimental "clockwiseAtomic" rendering mode (#8442)
78adb5f60b Ensure LayoutComponent doesnt try to access bg path if layout not compiled in (#8453)
4c83df9b7a Updating to latest harfbuzz for coretext issue (#8443)

Co-authored-by: Luigi Rosso <[email protected]>
  • Loading branch information
bodymovin and luigi-rosso committed Nov 5, 2024
1 parent 5ae5403 commit b3898a9
Show file tree
Hide file tree
Showing 17 changed files with 237 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .rive_head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5297cf0cc25ef5b45d438dddaefb2ac52cb8c4a1
aa20d8aad42d5c832b6c96dfdce2b57bae18fdf9
1 change: 1 addition & 0 deletions example/macos/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
**/Pods/

# Xcode-related
**/dgph
**/xcuserdata/
3 changes: 3 additions & 0 deletions example/macos/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ target 'Runner' do
use_modular_headers!

flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end

post_install do |installer|
Expand Down
228 changes: 205 additions & 23 deletions example/macos/Runner.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "331C80D4294CF70F00263BE5"
BuildableName = "RunnerTests.xctest"
BlueprintName = "RunnerTests"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions example/macos/Runner/Base.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@
</items>
</menu>
</menuItem>
<menuItem title="Help" id="EPT-qC-fAb">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="rJ0-wn-3NY"/>
</menuItem>
</items>
<point key="canvasLocation" x="142" y="-258"/>
</menu>
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner/Configs/AppInfo.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ PRODUCT_NAME = example
PRODUCT_BUNDLE_IDENTIFIER = com.example.example

// The copyright displayed in application information
PRODUCT_COPYRIGHT = Copyright © 2021 com.example. All rights reserved.
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
2 changes: 0 additions & 2 deletions example/macos/Runner/DebugProfile.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<true/>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion example/macos/Runner/MainFlutterWindow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import FlutterMacOS

class MainFlutterWindow: NSWindow {
override func awakeFromNib() {
let flutterViewController = FlutterViewController.init()
let flutterViewController = FlutterViewController()
let windowFrame = self.frame
self.contentViewController = flutterViewController
self.setFrame(windowFrame, display: true)
Expand Down
10 changes: 10 additions & 0 deletions lib/src/rive_core/state_machine_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,16 @@ class StateMachineController extends RiveAnimationController<CoreContext>
return false;
}

bool tryChangeState() {
bool didChangeState = false;
for (final layer in layerControllers) {
if (layer.updateState(true)) {
didChangeState = true;
}
}
return didChangeState;
}

void _clearLayerControllers() {
for (final layer in layerControllers) {
layer.dispose();
Expand Down

0 comments on commit b3898a9

Please sign in to comment.