merge 4.2.0 into 4.3.0
This commit is contained in:
Коммит
240219078f
|
@ -238,6 +238,9 @@ namespace Xamarin.Forms.Platform.MacOS
|
|||
|
||||
void UpdateTextDecorations()
|
||||
{
|
||||
if (IsElementOrControlEmpty)
|
||||
return;
|
||||
|
||||
if (Element?.TextType != TextType.Text)
|
||||
return;
|
||||
|
||||
|
@ -377,6 +380,8 @@ namespace Xamarin.Forms.Platform.MacOS
|
|||
void UpdateCharacterSpacing()
|
||||
{
|
||||
#if __MOBILE__
|
||||
if (IsElementOrControlEmpty)
|
||||
return;
|
||||
|
||||
if (Element?.TextType != TextType.Text)
|
||||
return;
|
||||
|
@ -392,7 +397,10 @@ namespace Xamarin.Forms.Platform.MacOS
|
|||
|
||||
void UpdateText()
|
||||
{
|
||||
switch (Element.TextType)
|
||||
if (IsElementOrControlEmpty)
|
||||
return;
|
||||
|
||||
switch (Element.TextType)
|
||||
{
|
||||
case TextType.Html:
|
||||
UpdateTextHtml();
|
||||
|
|
|
@ -39,7 +39,7 @@ namespace Xamarin.Forms.Platform.MacOS
|
|||
event EventHandler _controlChanging;
|
||||
event EventHandler _controlChanged;
|
||||
|
||||
bool IsElementOrControlEmpty => Element == null || Control == null;
|
||||
private protected bool IsElementOrControlEmpty => Element == null || Control == null;
|
||||
|
||||
protected virtual TNativeView CreateNativeControl()
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче