Skip to content

New FlipperControl #3431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 9 commits into from
Jan 7, 2024
Merged

New FlipperControl #3431

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6a0dc8
Starting work on new flipper design
Keboo Dec 14, 2023
0c713ca
Sorta kinda not working
Keboo Dec 14, 2023
d6f0b04
A working idea
Keboo Dec 21, 2023
1384b19
Adding demo page app to test the Plane3d
Keboo Dec 21, 2023
b74cbce
Working flipper
Keboo Jan 4, 2024
dd2957b
Renamed Flipper to FlipperClassic
Keboo Jan 4, 2024
2806f40
Split resource dictionaries
Keboo Jan 4, 2024
847bb09
Adding FlipperClassic to Generic.xaml
Keboo Jan 4, 2024
aa59588
UI test fixes
Keboo Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
A working idea
  • Loading branch information
@Keboo
Keboo committed Jan 4, 2024
commit d6f0b04099a0a2ea1a443cd52b2ea20b93e2be15
5 changes: 4 additions & 1 deletion MaterialDesignThemes.Wpf/Plane3D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ private FrameworkElement CreateVisualChild()
Material frontMaterial = new DiffuseMaterial(Brushes.White);
frontMaterial.SetValue(Viewport2DVisual3D.IsVisualHostMaterialProperty, true);

var vb = new VisualBrush(_logicalChild);
var vb = new VisualBrush(_logicalChild)
{
Stretch = Stretch.None
};
SetCachingForObject(vb); // big perf wins by caching!!
Material backMaterial = new DiffuseMaterial(vb);

Expand Down
10 changes: 8 additions & 2 deletions MaterialDesignThemes.Wpf/Plane3DNew.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,10 @@ private void SetupVisualElements()
frontMaterial.SetValue(Viewport2DVisual3D.IsVisualHostMaterialProperty, true);

//Ending item?
var vb = new VisualBrush(endingContent);
var vb = new VisualBrush(endingContent)
{
Stretch = Stretch.None
};
SetCachingForObject(vb); // big perf wins by caching!!
Material backMaterial = new DiffuseMaterial(vb);

Expand All @@ -213,7 +216,10 @@ private void SetupVisualElements()
var mv3D = new ModelVisual3D { Content = m3DGroup };

// Interactive frontside Visual3D
var frontVb = new VisualBrush(startingContent);
var frontVb = new VisualBrush(startingContent)
{
Stretch = Stretch.None
};
Rectangle rectangle = new Rectangle()
{
Fill = frontVb
Expand Down
30 changes: 27 additions & 3 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Flipper.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,20 @@
KeyTime="0:0:0.4"
Value="0" />
</DoubleAnimationUsingKeyFrames>
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackContentTransform" Storyboard.TargetProperty="X">
<DiscreteDoubleKeyFrame KeyTime="0:0:0.0" Value="-1000000" />
<DiscreteDoubleKeyFrame KeyTime="0:0:0.4" Value="0" />
</DoubleAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_BackContent" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0.4" Value="{x:Static Visibility.Visible}" />
<DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Visible}" />
</ObjectAnimationUsingKeyFrames>

<DoubleAnimationUsingKeyFrames Storyboard.TargetName="FrontContentTransform" Storyboard.TargetProperty="X">
<DiscreteDoubleKeyFrame KeyTime="0:0:0.0" Value="-1000000" />
<DiscreteDoubleKeyFrame KeyTime="0:0:0.4" Value="0" />
</DoubleAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_FrontContent" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Hidden}" />
<!--<DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Hidden}" />-->
<DiscreteObjectKeyFrame KeyTime="0:0:0.4" Value="{x:Static Visibility.Collapsed}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
Expand Down Expand Up @@ -322,10 +331,19 @@
KeyTime="0:0:0.4"
Value="0" />
</DoubleAnimationUsingKeyFrames>
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackContentTransform" Storyboard.TargetProperty="X">
<DiscreteDoubleKeyFrame KeyTime="0:0:0.0" Value="-1000000" />
<DiscreteDoubleKeyFrame KeyTime="0:0:0.4" Value="0" />
</DoubleAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_BackContent" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Hidden}" />
<!--<DiscreteObjectKeyFrame KeyTime="0:0:0.0" Value="{x:Static Visibility.Hidden}" />-->
<DiscreteObjectKeyFrame KeyTime="0:0:0.4" Value="{x:Static Visibility.Collapsed}" />
</ObjectAnimationUsingKeyFrames>

<DoubleAnimationUsingKeyFrames Storyboard.TargetName="FrontContentTransform" Storyboard.TargetProperty="X">
<DiscreteDoubleKeyFrame KeyTime="0:0:0.0" Value="-1000000" />
<DiscreteDoubleKeyFrame KeyTime="0:0:0.4" Value="0" />
</DoubleAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_FrontContent" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0:0:0.4" Value="{x:Static Visibility.Visible}" />
</ObjectAnimationUsingKeyFrames>
Expand Down Expand Up @@ -360,6 +378,9 @@
wpf:ElevationAssist.Elevation="{TemplateBinding wpf:ElevationAssist.Elevation}"
Style="{TemplateBinding wpf:FlipperAssist.CardStyle}"
UniformCornerRadius="{TemplateBinding wpf:FlipperAssist.UniformCornerRadius}">
<wpf:Card.RenderTransform>
<TranslateTransform x:Name="FrontContentTransform" />
</wpf:Card.RenderTransform>
<ContentPresenter x:Name="FrontContentPresenter"
Margin="{TemplateBinding Padding}"
Content="{TemplateBinding FrontContent}"
Expand All @@ -378,6 +399,9 @@
ContentStringFormat="{TemplateBinding BackContentStringFormat}"
ContentTemplate="{TemplateBinding BackContentTemplate}"
ContentTemplateSelector="{TemplateBinding BackContentTemplateSelector}" />
<wpf:Card.RenderTransform>
<TranslateTransform x:Name="BackContentTransform"/>
</wpf:Card.RenderTransform>
</wpf:Card>

<wpf:Plane3DNew x:Name="PART_Plane3D"
Expand Down