Skip to content

Commit

Permalink
Removed dropdown and added static buttons intead.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RubenKuilder
RubenKuilder committed Jun 21, 2020
1 parent 0314237 commit 8621788
Showing 1 changed file with 113 additions and 4 deletions.
117 changes: 113 additions & 4 deletions Main/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

<Grid Grid.Column="0" Background="#1E2931">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
Expand Down Expand Up @@ -61,6 +62,114 @@
</StackPanel>
</Border>

<!-- LOGOUT / SETTINGS BUTTONS -->
<Grid Grid.Row="1" Margin="0, 0, 0, 20">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="50*"/>
<ColumnDefinition Width="50*"/>
</Grid.ColumnDefinitions>

<Button
Grid.Column="0"

FontSize="16"
FontFamily="{StaticResource Lato}"
FontWeight="Regular"
Foreground="White"

BorderBrush="#FFFFFF"
BorderThickness="2"

Command="{Binding SettingsCommand}">
<Button.Style>
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#1C262E"/>
<Setter Property="BorderBrush" Value="Red"/>
<Setter Property="BorderThickness" Value="2"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}" Padding="10">
<ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#414E58"/>
</Trigger>
</Style.Triggers>
</Style>
</Button.Style>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="35"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<Image Grid.Column="0" Source="/Assets/Icons/settings.png" Width="20" HorizontalAlignment="Left"/>
<TextBlock
Grid.Column="1"
Text="Settings"

FontSize="16"
FontFamily="{StaticResource Lato}"
FontWeight="Regular"
Foreground="White"/>
</Grid>
</Button>

<Button
Grid.Column="1"

FontSize="16"
FontFamily="{StaticResource Lato}"
FontWeight="Regular"
Foreground="White"

BorderBrush="#FFFFFF"
BorderThickness="2"

Command="{Binding LogoutCommand}">
<Button.Style>
<Style TargetType="{x:Type Button}">
<Setter Property="Background" Value="#1C262E"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}" Padding="10">
<ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#414E58"/>
</Trigger>
</Style.Triggers>
</Style>
</Button.Style>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="35"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>

<Image Grid.Column="0" Source="/Assets/Icons/logout.png" Width="20" HorizontalAlignment="Left"/>
<TextBlock
Grid.Column="1"
Text="Logout"

FontSize="16"
FontFamily="{StaticResource Lato}"
FontWeight="Regular"
Foreground="White"/>
</Grid>
</Button>
</Grid>

<!--SEARCH INPUT-->
<!--<StackPanel
Grid.Row="1"
Expand All @@ -70,7 +179,7 @@

<TextBox
Text="Search..."
Grid.Row="1"
Grid.Row="2"

FontSize="16"
FontFamily="{StaticResource Lato}"
Expand All @@ -88,7 +197,7 @@
</TextBox>

<!-- LOGOUT / SETTINGS POPUP -->
<Canvas HorizontalAlignment="Center">
<!--<Canvas HorizontalAlignment="Center">
<Canvas.Style>
<Style TargetType="Canvas">
<Setter Property="Visibility" Value="Hidden"/>
Expand Down Expand Up @@ -183,12 +292,12 @@
</Grid>
</Button>
</Grid>
</Canvas>
</Canvas>-->

<!--CATEGORY LIST-->
<ListBox
x:Name="DriveListBox"
Grid.Row="2"
Grid.Row="3"

Background="Transparent"
BorderThickness="0"
Expand Down

0 comments on commit 8621788

Please sign in to comment.