Skip to content

Commit 8621788

Browse files
RubenKuilderRubenKuilder
committed
Removed dropdown and added static buttons intead.
1 parent 0314237 commit 8621788

File tree

1 file changed

+113
-4
lines changed

1 file changed

+113
-4
lines changed

‎Main/MainWindow.xaml‎

Lines changed: 113 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
<Grid Grid.Column="0" Background="#1E2931">
3232
<Grid.RowDefinitions>
33+
<RowDefinition Height="auto"/>
3334
<RowDefinition Height="auto"/>
3435
<RowDefinition Height="auto"/>
3536
<RowDefinition Height="*"/>
@@ -61,6 +62,114 @@
6162
</StackPanel>
6263
</Border>
6364

65+
<!-- LOGOUT / SETTINGS BUTTONS -->
66+
<Grid Grid.Row="1" Margin="0, 0, 0, 20">
67+
<Grid.ColumnDefinitions>
68+
<ColumnDefinition Width="50*"/>
69+
<ColumnDefinition Width="50*"/>
70+
</Grid.ColumnDefinitions>
71+
72+
<Button
73+
Grid.Column="0"
74+
75+
FontSize="16"
76+
FontFamily="{StaticResource Lato}"
77+
FontWeight="Regular"
78+
Foreground="White"
79+
80+
BorderBrush="#FFFFFF"
81+
BorderThickness="2"
82+
83+
Command="{Binding SettingsCommand}">
84+
<Button.Style>
85+
<Style TargetType="{x:Type Button}">
86+
<Setter Property="Background" Value="#1C262E"/>
87+
<Setter Property="BorderBrush" Value="Red"/>
88+
<Setter Property="BorderThickness" Value="2"/>
89+
<Setter Property="Template">
90+
<Setter.Value>
91+
<ControlTemplate TargetType="{x:Type Button}">
92+
<Border Background="{TemplateBinding Background}" Padding="10">
93+
<ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
94+
</Border>
95+
</ControlTemplate>
96+
</Setter.Value>
97+
</Setter>
98+
<Style.Triggers>
99+
<Trigger Property="IsMouseOver" Value="True">
100+
<Setter Property="Background" Value="#414E58"/>
101+
</Trigger>
102+
</Style.Triggers>
103+
</Style>
104+
</Button.Style>
105+
<Grid>
106+
<Grid.ColumnDefinitions>
107+
<ColumnDefinition Width="35"/>
108+
<ColumnDefinition Width="*"/>
109+
</Grid.ColumnDefinitions>
110+
111+
<Image Grid.Column="0" Source="/Assets/Icons/settings.png" Width="20" HorizontalAlignment="Left"/>
112+
<TextBlock
113+
Grid.Column="1"
114+
Text="Settings"
115+
116+
FontSize="16"
117+
FontFamily="{StaticResource Lato}"
118+
FontWeight="Regular"
119+
Foreground="White"/>
120+
</Grid>
121+
</Button>
122+
123+
<Button
124+
Grid.Column="1"
125+
126+
FontSize="16"
127+
FontFamily="{StaticResource Lato}"
128+
FontWeight="Regular"
129+
Foreground="White"
130+
131+
BorderBrush="#FFFFFF"
132+
BorderThickness="2"
133+
134+
Command="{Binding LogoutCommand}">
135+
<Button.Style>
136+
<Style TargetType="{x:Type Button}">
137+
<Setter Property="Background" Value="#1C262E"/>
138+
<Setter Property="Template">
139+
<Setter.Value>
140+
<ControlTemplate TargetType="{x:Type Button}">
141+
<Border Background="{TemplateBinding Background}" Padding="10">
142+
<ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
143+
</Border>
144+
</ControlTemplate>
145+
</Setter.Value>
146+
</Setter>
147+
<Style.Triggers>
148+
<Trigger Property="IsMouseOver" Value="True">
149+
<Setter Property="Background" Value="#414E58"/>
150+
</Trigger>
151+
</Style.Triggers>
152+
</Style>
153+
</Button.Style>
154+
<Grid>
155+
<Grid.ColumnDefinitions>
156+
<ColumnDefinition Width="35"/>
157+
<ColumnDefinition Width="*"/>
158+
</Grid.ColumnDefinitions>
159+
160+
<Image Grid.Column="0" Source="/Assets/Icons/logout.png" Width="20" HorizontalAlignment="Left"/>
161+
<TextBlock
162+
Grid.Column="1"
163+
Text="Logout"
164+
165+
FontSize="16"
166+
FontFamily="{StaticResource Lato}"
167+
FontWeight="Regular"
168+
Foreground="White"/>
169+
</Grid>
170+
</Button>
171+
</Grid>
172+
64173
<!--SEARCH INPUT-->
65174
<!--<StackPanel
66175
Grid.Row="1"
@@ -70,7 +179,7 @@
70179

71180
<TextBox
72181
Text="Search..."
73-
Grid.Row="1"
182+
Grid.Row="2"
74183

75184
FontSize="16"
76185
FontFamily="{StaticResource Lato}"
@@ -88,7 +197,7 @@
88197
</TextBox>
89198

90199
<!-- LOGOUT / SETTINGS POPUP -->
91-
<Canvas HorizontalAlignment="Center">
200+
<!--<Canvas HorizontalAlignment="Center">
92201
<Canvas.Style>
93202
<Style TargetType="Canvas">
94203
<Setter Property="Visibility" Value="Hidden"/>
@@ -183,12 +292,12 @@
183292
</Grid>
184293
</Button>
185294
</Grid>
186-
</Canvas>
295+
</Canvas>-->
187296

188297
<!--CATEGORY LIST-->
189298
<ListBox
190299
x:Name="DriveListBox"
191-
Grid.Row="2"
300+
Grid.Row="3"
192301

193302
Background="Transparent"
194303
BorderThickness="0"

0 commit comments

Comments
 (0)