tesses50
/
Ooui-tws-port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Forms 4.5.0.356

This commit is contained in:
Frank A. Krueger 2020-03-08 18:01:51 -07:00
parent 8fe076b29c
commit 4af54f13ee
No known key found for this signature in database
GPG Key ID: 0471C67474FFE664
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ooui.Forms/Ooui.Forms.csproj
View File

@ -18,7 +18,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Extensions\" /> <Folder Include="Extensions\" />

4
Ooui.Forms/Renderers/ButtonRenderer.cs
View File

@ -67,7 +67,7 @@ namespace Ooui.Forms.Renderers
UpdateFont (); UpdateFont ();
else if (e.PropertyName == Xamarin.Forms.Button.BorderWidthProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.CornerRadiusProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.BorderColorProperty.PropertyName) else if (e.PropertyName == Xamarin.Forms.Button.BorderWidthProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.CornerRadiusProperty.PropertyName || e.PropertyName == Xamarin.Forms.Button.BorderColorProperty.PropertyName)
UpdateBorder (); UpdateBorder ();
else if (e.PropertyName == Xamarin.Forms.Button.ImageProperty.PropertyName) else if (e.PropertyName == Xamarin.Forms.Button.ImageSourceProperty.PropertyName)
UpdateImage (); UpdateImage ();
} }
@ -113,7 +113,7 @@ namespace Ooui.Forms.Renderers
async void UpdateImage () async void UpdateImage ()
{ {
IImageSourceHandler handler; IImageSourceHandler handler;
FileImageSource source = Element.Image; ImageSource source = Element.ImageSource;
if (source != null && if (source != null &&
(handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null) (handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null)

8
Ooui.Forms/Renderers/LabelRenderer.cs
View File

@ -145,14 +145,12 @@ namespace Ooui.Forms.Renderers
{ {
_perfectSizeValid = false; _perfectSizeValid = false;
var values = Element.GetValues (Xamarin.Forms.Label.FormattedTextProperty, Xamarin.Forms.Label.TextProperty, Xamarin.Forms.Label.TextColorProperty); if (Element.FormattedText != null) {
var formatted = values[0] as FormattedString; Control.Text = Element.Text;
if (formatted != null) {
Control.Text = (string)values[1];
isTextFormatted = true; isTextFormatted = true;
} }
else { else {
Control.Text = (string)values[1]; Control.Text = Element.Text;
isTextFormatted = false; isTextFormatted = false;
} }
} }

8
Ooui.Forms/Renderers/LinkLabelRenderer.cs
View File

@ -131,14 +131,12 @@ namespace Ooui.Forms.Renderers
{ {
_perfectSizeValid = false; _perfectSizeValid = false;
var values = Element.GetValues (Xamarin.Forms.Label.FormattedTextProperty, Xamarin.Forms.Label.TextProperty, Xamarin.Forms.Label.TextColorProperty); if (Element.FormattedText != null) {
var formatted = values[0] as FormattedString; Control.Text = Element.Text;
if (formatted != null) {
Control.Text = (string)values[1];
isTextFormatted = true; isTextFormatted = true;
} }
else { else {
Control.Text = (string)values[1]; Control.Text = Element.Text;
isTextFormatted = false; isTextFormatted = false;
} }
} }

7
PlatformSamples/AspNetCoreMvc/AspNetCoreMvc.csproj
View File

@ -9,8 +9,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.3" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.3">
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
<Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Samples/Samples.csproj
View File

@ -10,7 +10,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>