Skip to content

Commit cc0aa0e

Browse files
author
Nicolas VERINAUD
committed
Update ReactiveNSView : add .ctor(CGRect) for Unified API.
1 parent 4ff011d commit cc0aa0e

File tree

2 files changed

+46
-12
lines changed

2 files changed

+46
-12
lines changed

‎ReactiveUI/Cocoa/ReactiveNSView.cs‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
using System;
2-
using System.Drawing;
3-
using System.Runtime.Serialization;
4-
using System.Reactive.Subjects;
5-
using System.Reactive.Concurrency;
6-
using System.Reflection;
2+
using System.Collections.Generic;
73
using System.ComponentModel;
4+
using System.Diagnostics.Contracts;
5+
using System.Drawing;
86
using System.Linq;
9-
using System.Threading;
7+
using System.Reactive;
8+
using System.Reactive.Concurrency;
109
using System.Reactive.Disposables;
11-
using System.Diagnostics.Contracts;
10+
using System.Reactive.Subjects;
11+
using System.Reflection;
1212
using System.Runtime.CompilerServices;
13-
using System.Collections.Generic;
13+
using System.Runtime.Serialization;
14+
using System.Threading;
1415
using Splat;
15-
using System.Reactive;
1616

1717
#if UNIFIED
18-
using UIKit;
18+
using CoreGraphics;
1919
using Foundation;
2020
using NSView = UIKit.UIView;
21+
using UIKit;
2122
#elif UIKIT
22-
using MonoTouch.UIKit;
2323
using MonoTouch.Foundation;
24+
using MonoTouch.UIKit;
2425
using NSView = MonoTouch.UIKit.UIView;
2526
#else
2627
using MonoMac.AppKit;
@@ -51,9 +52,15 @@ protected ReactiveView(IntPtr handle) : base(handle)
5152
{
5253
}
5354

55+
#if UNIFIED
56+
protected ReactiveView(CGRect frame) : base(frame)
57+
{
58+
}
59+
#else
5460
protected ReactiveView(RectangleF size) : base(size)
5561
{
5662
}
63+
#endif
5764

5865
public event PropertyChangingEventHandler PropertyChanging {
5966
add { PropertyChangingEventManager.AddHandler(this, value); }

‎ReactiveUI_XSIOS.sln‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_iOS", "ReactiveU
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_iOS_XS", "ReactiveUI.Events\ReactiveUI.Events_iOS_XS.csproj", "{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}"
2020
EndProject
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_iOS64", "ReactiveUI\ReactiveUI_iOS64.csproj", "{AF913370-A394-4DBD-801E-15E1FDA78FFC}"
22+
EndProject
2123
Global
2224
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2325
Debug|Any CPU = Debug|Any CPU
@@ -165,6 +167,32 @@ Global
165167
{9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
166168
{9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|x86.ActiveCfg = Release|Any CPU
167169
{9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|x86.Build.0 = Release|Any CPU
170+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
171+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
172+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
173+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|Any CPU.Build.0 = Release|Any CPU
174+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|iPhone.ActiveCfg = Release|Any CPU
175+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|iPhone.Build.0 = Release|Any CPU
176+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
178+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
179+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhone.Build.0 = Debug|Any CPU
180+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
181+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
182+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
183+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
184+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|x86.ActiveCfg = Debug|Any CPU
185+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|x86.Build.0 = Debug|Any CPU
186+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
187+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Any CPU.Build.0 = Release|Any CPU
188+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhone.ActiveCfg = Release|Any CPU
189+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhone.Build.0 = Release|Any CPU
190+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
191+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
192+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
193+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
194+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|x86.ActiveCfg = Release|Any CPU
195+
{AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|x86.Build.0 = Release|Any CPU
168196
{9091337A-9E94-4DBD-801E-05E1FDA78FFC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
169197
{9091337A-9E94-4DBD-801E-05E1FDA78FFC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
170198
{9091337A-9E94-4DBD-801E-05E1FDA78FFC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
@@ -221,7 +249,6 @@ Global
221249
GlobalSection(NestedProjects) = preSolution
222250
EndGlobalSection
223251
GlobalSection(MonoDevelopProperties) = preSolution
224-
StartupItem = ReactiveUI.Testing\ReactiveUI.Testing_iOS.csproj
225252
Policies = $0
226253
$0.TextStylePolicy = $1
227254
$1.inheritsSet = null

0 commit comments

Comments
 (0)