BareIcon button style. Readded links to main view

This commit is contained in:
Justin Swanson 2019-12-13 22:40:56 -06:00
parent 1fdfda0edf
commit 1a9bfcbdc6
9 changed files with 81 additions and 33 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -1552,6 +1552,40 @@
</Style.Triggers>
</Style>
<Style x:Key="IconBareButtonStyle" TargetType="ButtonBase">
<Setter Property="Focusable" Value="False" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}" CornerRadius="3">
<ContentPresenter
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="{StaticResource DisabledButtonForeground}" />
<Setter Property="Background" Value="Transparent" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderBrush" Value="{StaticResource GrayBrush7}" />
<Setter Property="Foreground" Value="{StaticResource IntenseComplementaryBrush}" />
<Setter Property="Background" Value="Transparent" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="{StaticResource BackgroundBrush}" />
</Trigger>
</Style.Triggers>
</Style>
<!-- ToggleButton -->
<Style TargetType="{x:Type ToggleButton}">
<Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />

View File

@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:icon="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:local="clr-namespace:Wabbajack"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@ -12,23 +13,39 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.Resources>
<Style TargetType="Image">
<Setter Property="Margin" Value="5" />
</Style>
</Grid.Resources>
<Image
Name="GitHub"
<Button
Grid.Column="0"
MouseLeftButtonDown="GitHub_MouseLeftButtonDown" Source="../Resources/Icons/github.png"/>
<Image
Name="Patreon"
Width="35"
Height="35"
Click="GitHub_Click"
Style="{StaticResource IconBareButtonStyle}">
<icon:PackIconMaterial
Width="25"
Height="25"
Kind="GithubCircle" />
</Button>
<Button
Grid.Column="1"
MouseLeftButtonDown="Patreon_MouseLeftButtonDown" Source="../Resources/Icons/patreon.png"/>
<Image
Name="Discord"
Width="35"
Height="35"
Margin="4,0,0,0"
Click="Patreon_Click"
Style="{StaticResource IconBareButtonStyle}">
<icon:PackIconMaterial
Width="25"
Height="25"
Kind="Patreon" />
</Button>
<Button
Grid.Column="2"
MouseLeftButtonDown="Discord_MouseLeftButtonDown"
Source="../Resources/Icons/discord.png" />
Width="35"
Height="35"
Click="Discord_Click"
Style="{StaticResource IconBareButtonStyle}">
<icon:PackIconMaterial
Width="25"
Height="25"
Kind="Discord" />
</Button>
</Grid>
</UserControl>

View File

@ -26,19 +26,19 @@ namespace Wabbajack
InitializeComponent();
}
private void GitHub_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
private void GitHub_Click(object sender, RoutedEventArgs e)
{
Process.Start("https://github.com/wabbajack-tools/wabbajack");
}
private void Patreon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
private void Discord_Click(object sender, RoutedEventArgs e)
{
Process.Start("https://discord.gg/wabbajack");
}
private void Patreon_Click(object sender, RoutedEventArgs e)
{
Process.Start("https://www.patreon.com/user?u=11907933");
}
private void Discord_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
Process.Start("https://discord.gg/zgbrkmA");
}
}
}

View File

@ -505,5 +505,12 @@
</Grid>
</Button>
</Grid>
<local:LinksView
Grid.Row="0"
Grid.RowSpan="3"
Grid.Column="0"
Margin="10"
HorizontalAlignment="Right"
VerticalAlignment="Top" />
</Grid>
</UserControl>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@ -444,12 +444,6 @@
<ItemGroup>
<EmbeddedResource Include="Resources\banner_small.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons\discord.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Icons\next.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Banner_Dark.png" />
</ItemGroup>
@ -548,10 +542,6 @@
<Resource Include="Resources\Icons\gog.png" />
<Resource Include="Resources\Icons\steam.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons\github.png" />
<Resource Include="Resources\Icons\patreon.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Wabba_Mouth_No_Text.png" />
</ItemGroup>