sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +14 -2
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 756c646b93 - Show all commits

5
ClientApp/ViewModels/MainWindowViewModel.cs
View File

@@ -48,10 +48,15 @@ namespace ClientApp.ViewModels
public double MinimumHeight { get; set; } = 250; public double MinimumHeight { get; set; } = 250;
public int ResizeBorder { get; set; } = 6; public int ResizeBorder { get; set; } = 6;
public Thickness ResizeBorderThickness { get { return new Thickness(ResizeBorder + OuterMarginSize); } } public Thickness ResizeBorderThickness { get { return new Thickness(ResizeBorder + OuterMarginSize); } }
public Thickness InnerContentPadding { get { return new Thickness(ResizeBorder); } }
public Thickness OuterMarginThickness { get { return new Thickness(OuterMarginSize); } } public Thickness OuterMarginThickness { get { return new Thickness(OuterMarginSize); } }
public CornerRadius WindowCornerRadius { get { return new CornerRadius(WindowRadius); } } public CornerRadius WindowCornerRadius { get { return new CornerRadius(WindowRadius); } }

11
ClientApp/Views/MainWindow.xaml
View File

@@ -80,13 +80,14 @@
</Grid> </Grid>
<!-- shadow? -->
<Border Grid.Row="1" Height="6" BorderThickness="0 0.2 0 0"> <Border Grid.Row="1" Height="6" BorderThickness="0 0.2 0 0">
<Border.BorderBrush> <!--<Border.BorderBrush>
<LinearGradientBrush StartPoint="0,0" EndPoint="1,0"> <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
<GradientStop Color="{StaticResource BackgroundSemiLight}" Offset="0.0"/> <GradientStop Color="{StaticResource BackgroundSemiLight}" Offset="0.0"/>
<GradientStop Color="{StaticResource BackgroundVeryLight}" Offset="1.0"/> <GradientStop Color="{StaticResource BackgroundVeryLight}" Offset="1.0"/>
</LinearGradientBrush> </LinearGradientBrush>
</Border.BorderBrush> </Border.BorderBrush>-->
<Border.Background> <Border.Background>
@@ -97,6 +98,12 @@
</Border.Background> </Border.Background>
</Border> </Border>
</Grid> </Grid>
<!-- Page content -->
<Border Grid.Row="2" Grid.Column="0" Margin="20">
<ContentPresenter Content="{TemplateBinding Content}"/>
</Border>
</Grid> </Grid>
</Border> </Border>
</ControlTemplate> </ControlTemplate>