Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readded shadow to WJ background. Some styling

Browse Source
This commit is contained in:
Justin Swanson
2019-11-01 19:32:45 -05:00
parent f77359ee7d
commit dc5ad70145
2 changed files with 247 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Wabbajack/View Models/InstallerVM.cs
View File

@ -83,9 +83,6 @@ namespace Wabbajack
private readonly ObservableAsPropertyHelper<string> _Description; private readonly ObservableAsPropertyHelper<string> _Description;
public string Description => _Description.Value; public string Description => _Description.Value;
private readonly ObservableAsPropertyHelper<bool> _ShowTextShadow;
public bool ShowTextShadow => _ShowTextShadow.Value;
// Command properties // Command properties
public IReactiveCommand BeginCommand { get; } public IReactiveCommand BeginCommand { get; }
public IReactiveCommand ShowReportCommand { get; } public IReactiveCommand ShowReportCommand { get; }
@ -224,15 +221,6 @@ namespace Wabbajack
resultSelector: (modList, mod, installing) => installing ? mod : modList) resultSelector: (modList, mod, installing) => installing ? mod : modList)
.ToProperty(this, nameof(this.Description)); .ToProperty(this, nameof(this.Description));
this._ShowTextShadow = this.WhenAny(x => x.Image)
.Select(image =>
{
if (image == null) return false;
if (image == this.WabbajackLogo) return false;
return true;
})
.ToProperty(this, nameof(ShowTextShadow));
// Define commands // Define commands
this.ShowReportCommand = ReactiveCommand.Create(ShowReport); this.ShowReportCommand = ReactiveCommand.Create(ShowReport);
this.OpenReadmeCommand = ReactiveCommand.Create( this.OpenReadmeCommand = ReactiveCommand.Create(

28
Wabbajack/Views/InstallationView.xaml
View File

@ -16,7 +16,7 @@
<Color x:Key="TextBackgroundHoverFill">#DF000000</Color> <Color x:Key="TextBackgroundHoverFill">#DF000000</Color>
<Style x:Key="BackgroundBlurStyle" TargetType="Border"> <Style x:Key="BackgroundBlurStyle" TargetType="Border">
<Setter Property="Background" Value="{StaticResource TextBackgroundFillBrush}" /> <Setter Property="Background" Value="{StaticResource TextBackgroundFillBrush}" />
<Setter Property="Visibility" Value="Hidden" /> <Setter Property="Visibility" Value="Visible" />
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, ElementName=Slideshow}" Value="True"> <DataTrigger Binding="{Binding IsMouseOver, ElementName=Slideshow}" Value="True">
<DataTrigger.EnterActions> <DataTrigger.EnterActions>
@ -40,8 +40,8 @@
</BeginStoryboard> </BeginStoryboard>
</DataTrigger.ExitActions> </DataTrigger.ExitActions>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding ShowTextShadow}" Value="True"> <DataTrigger Binding="{Binding Image}" Value="{x:Null}">
<Setter Property="Visibility" Value="Visible" /> <Setter Property="Visibility" Value="Hidden" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@ -54,7 +54,7 @@
<Setter Property="Margin" Value="4" /> <Setter Property="Margin" Value="4" />
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="5"> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40" /> <RowDefinition Height="40" />
<RowDefinition Height="5" /> <RowDefinition Height="5" />
@ -62,10 +62,13 @@
<RowDefinition Height="*" MinHeight="150" /> <RowDefinition Height="*" MinHeight="150" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Slideshow --> <!-- Slideshow -->
<Grid <Border
x:Name="Slideshow" x:Name="Slideshow"
Grid.Row="2" Grid.Row="2"
Margin="0,0,0,5"> Margin="5,0,5,5"
BorderBrush="#171717"
BorderThickness="1,0,1,1">
<Grid ClipToBounds="True">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="5*" /> <ColumnDefinition Width="5*" />
<ColumnDefinition Width="3*" /> <ColumnDefinition Width="3*" />
@ -306,11 +309,13 @@
</TextBlock> </TextBlock>
</Grid> </Grid>
</Grid> </Grid>
</Border>
<!-- Top progress bar --> <!-- Top progress bar -->
<!-- Comes after slideshow control, so that any effects/overlap goes on top --> <!-- Comes after slideshow control, so that any effects/overlap goes on top -->
<Rectangle <Rectangle
Grid.Row="2" Grid.Row="2"
Height="25" Height="25"
Margin="6,0"
VerticalAlignment="Top" VerticalAlignment="Top"
IsHitTestVisible="False"> IsHitTestVisible="False">
<Rectangle.Fill> <Rectangle.Fill>
@ -473,7 +478,11 @@
</mahapps:MetroProgressBar.Foreground> </mahapps:MetroProgressBar.Foreground>
</mahapps:MetroProgressBar> </mahapps:MetroProgressBar>
<!-- Bottom Area --> <!-- Bottom Area -->
<Grid Grid.Row="3" Visibility="{Binding InstallingMode, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}"> <Grid
Grid.Row="3"
Margin="5,0,5,5"
ClipToBounds="True"
Visibility="{Binding InstallingMode, Converter={StaticResource bool2VisibilityConverter}, ConverterParameter=False}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="4" /> <ColumnDefinition Width="4" />
@ -649,7 +658,10 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Fill="{StaticResource DarkBackgroundBrush}" /> Fill="{StaticResource DarkBackgroundBrush}" />
</Grid> </Grid>
<Grid Grid.Row="3" Visibility="{Binding InstallingMode, Converter={StaticResource bool2VisibilityConverter}}"> <Grid
Grid.Row="3"
Margin="5,0,5,5"
Visibility="{Binding InstallingMode, Converter={StaticResource bool2VisibilityConverter}}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="4" /> <ColumnDefinition Width="4" />