Skip to content

fix: activate iOS views synchronously #1540

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
kentcb merged 2 commits into from
Nov 29, 2017
Merged

fix: activate iOS views synchronously #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f4bc32
Use synchronous activation in iOS view classes
tgjones Nov 22, 2017
9196f30
Merge branch 'develop' into cocoa-activation
kentcb Nov 29, 2017
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 src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
#else
base.ViewWillMoveToSuperview(newsuper);
#endif
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}

void ICanForceManualActivation.Activate(bool activate)
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
#else
base.ViewWillMoveToSuperview(newsuper);
#endif
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}

void ICanForceManualActivation.Activate(bool activate)
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Platforms/apple-common/ReactiveNSView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public override void ViewWillMoveToSuperview(NSView newsuper)
base.ViewWillMoveToSuperview(newsuper);
}
#endif
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}

void ICanForceManualActivation.Activate(bool activate)
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Platforms/ios/ReactiveCollectionViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public IDisposable SuppressChangeNotifications()
public override void WillMoveToSuperview(UIView newsuper)
{
base.WillMoveToSuperview(newsuper);
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Platforms/ios/ReactiveTableView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public IDisposable SuppressChangeNotifications()
public override void WillMoveToSuperview(UIView newsuper)
{
base.WillMoveToSuperview(newsuper);
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}

void ICanForceManualActivation.Activate(bool activate)
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI/Platforms/ios/ReactiveTableViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public IDisposable SuppressChangeNotifications()
public override void WillMoveToSuperview(UIView newsuper)
{
base.WillMoveToSuperview(newsuper);
RxApp.MainThreadScheduler.Schedule(() => (newsuper != null ? activated : deactivated).OnNext(Unit.Default));
(newsuper != null ? activated : deactivated).OnNext(Unit.Default);
}
}

Expand Down