Skip to content

Commit

Permalink
SettingsExpander (#253)
Browse files Browse the repository at this point in the history
* Adding new controls

* Uno fixes

* Added SettingsExpanderSample

* Adding sampleref

* Bugfixes

* CI fix

* Fix CI

* Adding ExpanderV2

* CI fix

* Update Generic.xaml

* Add overrides

* Uno fixes

* CI fix

* Update ExampleSettingsControlsTestClass.cs

* Simplifing state setting

* Revert "Simplifing state setting"

This reverts commit a014377730da0672d6e8010e58de0d006b0099ba.

* Quick fix to enable building locally to workaround unoplatform/uno#9297

* Update labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>

* Update labs/SettingsControls/samples/SettingsControls.Samples/SettingsExpanderSample.xaml

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>

* Tweaks

* Renamed ButtonIcon to ActionIcon

* Make SettingsExpander Content a ContentProperty

* File rename

* Making the StyleSelector work

* Add github.com/rudyhuyn/XamlPlus Attached Style Helper

Resolve issue with ToggleSwitch override due to microsoft/microsoft-ui-xaml#7792

* Add binding to Expander option toggle

Note: should be TwoWay bound but issue on Uno, added note here for now: CommunityToolkit/Labs-Windows#207 (comment)

* Removing HeaderedContentControl from the template

* XAML styling

* Removed HeaderedContentControl out of the SettingsCard template

* Adding WrapThreshold

* Fix failing test in SettingsCard tests

* Tweaked SettingsCard sample

* XAML styling

* Remove SettingsExpanderItem and use SettingsCard directly

Allows for better interop to just cut/paste SettingsCards in/out of Expanders 🙂

* UI tweaks to samples and SettingsCard to render the correct height

* Adding VSM only

* Temp: Comment out column trigger which was causing control to grow after state change and cause infinite layout cycle

i.e. when the break point was reached (e.g. control size 560), VSM was changing the layout and now control size would be larger again (e.g. 605), which would then turn off trigger and re-layout back to old size which would now be smaller again, etc...

We need to ensure the transition between the Right and Vertical states doesn't increase the width of the control.

* Remove redundant minwidth

* Clean up code, comments

* Code cleanup SettingsCard

* Settings ToolkitSampleRenderer alignment to Stretch

* Bumping version number

* Removing HeaderedContentControl

* Removing remaining reference

* Add triggers

* Update Generic.xaml

* Update Generic.xaml

* Use ThemeResource instead of StaticResource

Co-authored-by: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Co-authored-by: Rudy Huyn <rudyhuyn@gmail.com>
  • Loading branch information
3 people authored Oct 13, 2022
1 parent 94f6f25 commit 873c0ce
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@
<ContentControl x:Name="PageControl"
Grid.Row="1"
Padding="24"
HorizontalAlignment="Left"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Content="{x:Bind SampleControlInstance, Mode=OneWay}" />


Expand Down

0 comments on commit 873c0ce

Please sign in to comment.