Fix 54334 #855

Merged
merged 3 commits into from Apr 6, 2017

Conversation

Projects
None yet
4 participants
@StephaneDelcroix
Member

StephaneDelcroix commented Apr 3, 2017

Description of Change

When setting a value with SetValue, unset the IsFromStyle flag to avoid bypass determined on that flag only.

NOTE: this might be a regression on 2.3.4 and might need to be backported and released

Bugs Fixed

API Changes

/

Behavioral Changes

/

PR Checklist

  • Has tests (if omitted, state reason in description)
  • Rebased on top of master at time of PR
  • Changes adhere to coding standard
  • Consolidate commits as makes sense

StephaneDelcroix added some commits Apr 6, 2017

@StephaneDelcroix

This comment has been minimized.

Show comment
Hide comment
@StephaneDelcroix

StephaneDelcroix Apr 6, 2017

Member

@samhouts please review again

Member

StephaneDelcroix commented Apr 6, 2017

@samhouts please review again

+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Xamarin.Forms.Xaml.UnitTests.Bz54334">
+<StackLayout Padding="10">
+ <Label x:Name="label" HorizontalTextAlignment="Center" Text="I have a set textcolor, but in since pre-3 styles will override it.." TextColor="Black" />
+ <Label x:Name="themedLabel" HorizontalTextAlignment="Center" Text="I dont have a set textcolor, syles can override me as much as they want" />

This comment has been minimized.

@samhouts

samhouts Apr 6, 2017

Member

small thing: typo. syles instead of styles. also missing an apostrophe, but whatever.

@samhouts

samhouts Apr 6, 2017

Member

small thing: typo. syles instead of styles. also missing an apostrophe, but whatever.

This comment has been minimized.

@StephaneDelcroix

StephaneDelcroix Apr 6, 2017

Member

I'm copy pasting user repro code

@StephaneDelcroix

StephaneDelcroix Apr 6, 2017

Member

I'm copy pasting user repro code

@jassmith

Overall looks good, changes make sense. No idea why we weren't unsetting the flag before.

@jassmith jassmith merged commit 0ee6360 into master Apr 6, 2017

6 checks passed

Android-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: UI Tests :: OSX Test Cloud Package - Run Android 6.0.1 : Tests passe…
Details
OSX-Debug-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: OSX Debug : Running
Details
Windows-Debug-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: Windows Debug : Tests passed: 3760, ignored: 10
Details
iOS10-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified iOS10 : Tests p…
Details
iOS8-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified IOS8 : Tests pa…
Details
iOS9-UITests-C8 Finished TeamCity Build Xamarin.Forms :: Debug :: Stable - Cycle 9 :: UI Tests :: OSX Test Cloud Package - Run iOS Unified iOS9 : Tests pa…
Details

rmarinho added a commit that referenced this pull request Apr 6, 2017

Fix 54334 (#855)
* [C] unset the FromStyle flag on manual setting

* [C] Do not reset overriden values to default

* complete the fix

@rmarinho rmarinho deleted the fix-54334 branch Jun 22, 2017

@samhouts samhouts added D15.4 and removed cla-not-required labels Oct 10, 2017

@samhouts samhouts added this to the 2.3.4 milestone Jun 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment