Skip to content

Commit 3b3a51a

Browse files
tuke307tuke307
committed
Merge branch 'master' of https://github.com/tuke307/LibBuilder 
2 parents 3e00a5a + 7e76bc0 commit 3b3a51a

File tree

3 files changed

+49
-75
lines changed

3 files changed

+49
-75
lines changed

‎azure-pipelines.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/LibBuilder.WPF.Core/Views/MainView.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Copyright (c) 2020 Timeline Financials GmbH & Co. KG. All rights reserved.
99
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
1010
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
1111
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
12-
xmlns:region="clr-namespace:Mvx.Wpf.ItemsPresenter;assembly=Mvx.Wpf.ItemsPresenter"
1312
xmlns:viewModels="clr-namespace:LibBuilder.WPF.Core.ViewModels"
1413
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
14+
xmlns:region="clr-namespace:Mvx.Wpf.ItemsPresenter;assembly=Mvx.Wpf.ItemsPresenter"
1515
x:TypeArguments="viewModels:MainViewModel"
1616
mc:Ignorable="d"
17-
MinHeight="30"
17+
MinHeight="40"
1818
MinWidth="450"
19-
d:DesignHeight="30"
19+
d:DesignHeight="40"
2020
d:DesignWidth="450">
2121
<views:MvxWpfView.Resources>
2222
<ResourceDictionary>
@@ -27,7 +27,7 @@ Copyright (c) 2020 Timeline Financials GmbH & Co. KG. All rights reserved.
2727
</views:MvxWpfView.Resources>
2828
<Grid>
2929
<Grid.RowDefinitions>
30-
<RowDefinition Height="30" />
30+
<RowDefinition Height="40" />
3131
<RowDefinition Height="*" />
3232
</Grid.RowDefinitions>
3333

‎src/LibBuilder.WPF.Core/Views/MainWindow.xaml‎

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ Copyright (c) 2020 Timeline Financials GmbH & Co. KG. All rights reserved.
88
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
11-
xmlns:region="clr-namespace:Mvx.Wpf.ItemsPresenter;assembly=Mvx.Wpf.ItemsPresenter"
1211
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
12+
xmlns:region="clr-namespace:Mvx.Wpf.ItemsPresenter;assembly=Mvx.Wpf.ItemsPresenter"
1313
mc:Ignorable="d"
14-
MinHeight="730"
1514
MinWidth="900"
16-
Height="730"
17-
Width="900"
18-
d:DesignHeight="730"
15+
MinHeight="750"
16+
d:DesignHeight="750"
1917
d:DesignWidth="900"
20-
WindowStyle="None"
21-
ResizeMode="CanResizeWithGrip"
18+
x:TypeArguments="viewModels:MainWindowViewModel"
2219
AllowsTransparency="True"
23-
WindowStartupLocation="CenterScreen">
20+
ResizeMode="CanResizeWithGrip"
21+
WindowStartupLocation="CenterScreen"
22+
WindowStyle="None"
23+
mc:Ignorable="d">
2424
<views:MvxWindow.Resources>
2525
<ResourceDictionary>
2626
<ResourceDictionary.MergedDictionaries>
@@ -31,7 +31,7 @@ Copyright (c) 2020 Timeline Financials GmbH & Co. KG. All rights reserved.
3131

3232
<Grid>
3333
<Grid.RowDefinitions>
34-
<RowDefinition Height="30" />
34+
<RowDefinition Height="40" />
3535
<RowDefinition Height="*" />
3636
</Grid.RowDefinitions>
3737

@@ -44,50 +44,58 @@ Copyright (c) 2020 Timeline Financials GmbH & Co. KG. All rights reserved.
4444
</Grid.ColumnDefinitions>
4545

4646
<ItemsControl Grid.Column="0"
47-
region:MvxContainer.Id="NavigationRegion"></ItemsControl>
47+
region:MvxContainer.Id="NavigationRegion" />
4848

4949
<StackPanel Grid.Column="1"
50-
Orientation="Horizontal"
5150
HorizontalAlignment="Right"
52-
Margin="10,0">
53-
<Button Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
54-
Width="25"
55-
Height="25"
51+
Orientation="Horizontal">
52+
<Button Grid.Column="0"
53+
MinHeight="40"
54+
MinWidth="70"
5655
Background="{x:Null}"
5756
BorderBrush="{x:Null}"
57+
Click="WindowMinimize_Click"
58+
VerticalAlignment="Stretch"
5859
Foreground="White"
59-
Click="WindowMinimize_Click">
60-
<materialDesign:PackIcon Kind="WindowMinimize" />
60+
Style="{StaticResource MaterialDesignRaisedButton}">
61+
<materialDesign:PackIcon Width="25"
62+
Height="25"
63+
Kind="WindowMinimize" />
6164
</Button>
62-
<Button Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
63-
Width="25"
64-
Height="25"
65+
<Button Grid.Column="1"
66+
MinHeight="40"
67+
MinWidth="70"
6568
Background="{x:Null}"
6669
BorderBrush="{x:Null}"
70+
Click="WindowMaximize_Click"
6771
Foreground="White"
68-
Click="WindowMaximize_Click">
69-
<materialDesign:PackIcon Kind="WindowMaximize" />
72+
Style="{StaticResource MaterialDesignRaisedButton}">
73+
<materialDesign:PackIcon Width="25"
74+
Height="25"
75+
Kind="WindowMaximize" />
7076
</Button>
71-
<Button Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}"
72-
Width="25"
73-
Height="25"
74-
Background="{x:Null}"
75-
BorderBrush="{x:Null}"
76-
Foreground="White"
77-
Click="WindowClose_Click">
78-
<materialDesign:PackIcon Kind="WindowClose" />
77+
<Button Grid.Column="2"
78+
MinHeight="40"
79+
MinWidth="70"
80+
Background="{x:Null}"
81+
BorderBrush="{x:Null}"
82+
Click="WindowClose_Click"
83+
Foreground="White"
84+
Style="{StaticResource MaterialDesignRaisedButton}">
85+
<materialDesign:PackIcon Width="25"
86+
Height="25"
87+
Kind="WindowClose" />
7988
</Button>
8089
</StackPanel>
8190
</Grid>
8291

83-
<!--FÜR USER-CONTROLS-->
92+
<!-- FÜR USER-CONTROLS -->
8493
<ItemsControl Grid.Row="1"
85-
region:MvxContainer.Id="MainWindowRegion"></ItemsControl>
94+
region:MvxContainer.Id="MainWindowRegion" />
8695

87-
<materialDesign:DialogHost Grid.Row="1"
88-
VerticalAlignment="Bottom"
89-
HorizontalAlignment="Center"
90-
Identifier="DialogSnackbar">
91-
</materialDesign:DialogHost>
96+
<materialDesign:DialogHost Grid.Row="1"
97+
HorizontalAlignment="Center"
98+
VerticalAlignment="Bottom"
99+
Identifier="DialogSnackbar" />
92100
</Grid>
93101
</views:MvxWindow>

0 commit comments

Comments
 (0)