mirror of
https://github.com/knah/VRCMelonAssistant.git
synced 2024-10-01 17:46:30 +13:00
Add Rectangle to MainWindow for background color
This commit is contained in:
parent
4382f22fdc
commit
637cf096fd
3 changed files with 90 additions and 87 deletions
|
@ -288,8 +288,8 @@
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style TargetType="Grid" x:Key="GridBase">
|
<Style TargetType="Rectangle">
|
||||||
<Setter Property="Background" Value="{DynamicResource ModAssistantBackground}"/>
|
<Setter Property="Fill" Value="{DynamicResource ModAssistantBackground}"/>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|
|
@ -8,95 +8,98 @@
|
||||||
Icon="Resources/icon.ico"
|
Icon="Resources/icon.ico"
|
||||||
Title="Mod Assistant" Width="1280" Height="720"
|
Title="Mod Assistant" Width="1280" Height="720"
|
||||||
UIElement.PreviewMouseDown="Window_PreviewMouseDown">
|
UIElement.PreviewMouseDown="Window_PreviewMouseDown">
|
||||||
<Grid Margin="10">
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Rectangle/>
|
||||||
<RowDefinition Height="*"/>
|
<Grid Margin="10">
|
||||||
<RowDefinition Height="50"/>
|
<Grid.RowDefinitions>
|
||||||
</Grid.RowDefinitions>
|
<RowDefinition Height="*"/>
|
||||||
<Grid.ColumnDefinitions>
|
<RowDefinition Height="50"/>
|
||||||
<ColumnDefinition Width="70"/>
|
</Grid.RowDefinitions>
|
||||||
<ColumnDefinition Width="*"/>
|
<Grid.ColumnDefinitions>
|
||||||
</Grid.ColumnDefinitions>
|
<ColumnDefinition Width="70"/>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Grid Grid.Column="0">
|
<Grid Grid.Column="0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="65" />
|
<RowDefinition Height="65" />
|
||||||
<RowDefinition Height="70" />
|
<RowDefinition Height="70" />
|
||||||
<RowDefinition Height="70" />
|
<RowDefinition Height="70" />
|
||||||
<RowDefinition Height="70" />
|
<RowDefinition Height="70" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Button Name="IntroButton" Grid.Row="0" Height="60" Margin="0,0,10,5" Background="white" Click="IntroButton_Click">
|
<Button Name="IntroButton" Grid.Row="0" Height="60" Margin="0,0,10,5" Background="white" Click="IntroButton_Click">
|
||||||
<StackPanel Margin="0,8,0,0">
|
<StackPanel Margin="0,8,0,0">
|
||||||
<Image Height="30" Source="Resources/Intro.png" VerticalAlignment="Bottom"></Image>
|
<Image Height="30" Source="Resources/Intro.png" VerticalAlignment="Bottom"></Image>
|
||||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Intro</TextBlock>
|
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Intro</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button IsEnabled="false" Name="ModsButton" Grid.Row="1" Height="60" Margin="0,5,10,5" Background="white" Click="ModsButton_Click">
|
<Button IsEnabled="false" Name="ModsButton" Grid.Row="1" Height="60" Margin="0,5,10,5" Background="white" Click="ModsButton_Click">
|
||||||
<StackPanel Margin="0,6,0,0">
|
<StackPanel Margin="0,6,0,0">
|
||||||
<Image Height="30" Source="Resources/Mods.png" VerticalAlignment="Bottom"></Image>
|
<Image Height="30" Source="Resources/Mods.png" VerticalAlignment="Bottom"></Image>
|
||||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Mods</TextBlock>
|
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Mods</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button Name="AboutButton" Grid.Row="2" Height="60" Margin="0,5,10,5" Background="white" Click="AboutButton_Click">
|
<Button Name="AboutButton" Grid.Row="2" Height="60" Margin="0,5,10,5" Background="white" Click="AboutButton_Click">
|
||||||
<StackPanel Margin="0,6,0,0">
|
<StackPanel Margin="0,6,0,0">
|
||||||
<Image Height="30" Source="Resources/About.png" VerticalAlignment="Bottom"></Image>
|
<Image Height="30" Source="Resources/About.png" VerticalAlignment="Bottom"></Image>
|
||||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">About</TextBlock>
|
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">About</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button Name="OptionsButton" Grid.Row="3" Height="60" Margin="0,5,10,5" Background="white" Click="OptionsButton_Click">
|
<Button Name="OptionsButton" Grid.Row="3" Height="60" Margin="0,5,10,5" Background="white" Click="OptionsButton_Click">
|
||||||
<StackPanel Margin="0,5,0,0">
|
<StackPanel Margin="0,5,0,0">
|
||||||
<Image Height="30" Source="Resources/Options.png" VerticalAlignment="Bottom"></Image>
|
<Image Height="30" Source="Resources/Options.png" VerticalAlignment="Bottom"></Image>
|
||||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Options</TextBlock>
|
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" VerticalAlignment="Bottom">Options</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<StackPanel Name="GameVersions" Grid.Row="5" VerticalAlignment="Bottom">
|
<StackPanel Name="GameVersions" Grid.Row="5" VerticalAlignment="Bottom">
|
||||||
<TextBlock Text="Game Version:" FontSize="10"/>
|
<TextBlock Text="Game Version:" FontSize="10"/>
|
||||||
<ComboBox Name="GameVersionsBox" Margin="0,5,5,0" SelectionChanged="GameVersionsBox_SelectionChanged">
|
<ComboBox Name="GameVersionsBox" Margin="0,5,5,0" SelectionChanged="GameVersionsBox_SelectionChanged">
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<StackPanel Grid.Row="1" VerticalAlignment="Center">
|
<StackPanel Grid.Row="1" VerticalAlignment="Center">
|
||||||
<TextBlock Text="Version" HorizontalAlignment="Center"/>
|
<TextBlock Text="Version" HorizontalAlignment="Center"/>
|
||||||
<TextBlock Name="VersionText" HorizontalAlignment="Center"/>
|
<TextBlock Name="VersionText" HorizontalAlignment="Center"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Frame Grid.Column="1" Name="Main" NavigationUIVisibility="Hidden" />
|
<Frame Grid.Column="1" Name="Main" NavigationUIVisibility="Hidden" />
|
||||||
|
|
||||||
<Grid Grid.Row="1" Grid.Column="1" >
|
<Grid Grid.Row="1" Grid.Column="1" >
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="115" />
|
<ColumnDefinition Width="115" />
|
||||||
<ColumnDefinition Width="115" />
|
<ColumnDefinition Width="115" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<TextBlock Name="MainTextBlock" Padding="5" Height="40" VerticalAlignment="Bottom" Background="LightGray" FontSize="20" />
|
<TextBlock Name="MainTextBlock" Padding="5" Height="40" VerticalAlignment="Bottom" Background="LightGray" FontSize="20" />
|
||||||
<Button Grid.Column="1" Name="InfoButton" IsEnabled="False" Height="40" Width="100" HorizontalAlignment="Right" Margin="0,10,0,0" Click="InfoButton_Click">
|
<Button Grid.Column="1" Name="InfoButton" IsEnabled="False" Height="40" Width="100" HorizontalAlignment="Right" Margin="0,10,0,0" Click="InfoButton_Click">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
||||||
Mod Info
|
Mod Info
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button Grid.Column="2" Name="InstallButton" IsEnabled="False" Height="40" Width="100" HorizontalAlignment="Right" Margin="0,10,0,0" Click="InstallButton_Click">
|
<Button Grid.Column="2" Name="InstallButton" IsEnabled="False" Height="40" Width="100" HorizontalAlignment="Right" Margin="0,10,0,0" Click="InstallButton_Click">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
||||||
Install
|
Install
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">
|
||||||
or Update
|
or Update
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|
|
@ -48,6 +48,6 @@
|
||||||
<SolidColorBrush x:Key="CheckboxTickColor" Color="White"/>
|
<SolidColorBrush x:Key="CheckboxTickColor" Color="White"/>
|
||||||
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF"/>
|
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF"/>
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ModAssistantBackground" Color="#1a1a1a"/>
|
<SolidColorBrush x:Key="ModAssistantBackground" Color="#0f0f0f"/>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
Loading…
Reference in a new issue