Skip to content

Commit

Permalink
Fix invisible download links in k1 style
Browse files Browse the repository at this point in the history
  • Loading branch information
@th3w1zard1
th3w1zard1 committed Oct 3, 2023
1 parent 16e09d2 commit 00b905a
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 29 deletions.
11 changes: 10 additions & 1 deletion KOTORModSync.GUI/MainWindow.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
</DockPanel>

<Grid Grid.Row="1" Grid.Column="0" RowDefinitions="Auto,*,Auto">
<!-- ReSharper disable once Xaml.BindingWithoutContextNotResolved -->
<TextBox Grid.Row="0" Margin="0,0,0,2" HorizontalAlignment="Stretch"
Name="SearchBox" ToolTip.Tip="Search for a mod by name" Text="{Binding SearchText}" />
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled">
Expand Down Expand Up @@ -86,8 +87,9 @@
<TabItem x:Name="SummaryTabItem" Header="Summary">
<TabItem.Content>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<!-- ReSharper disable once Xaml.BindingWithoutContextNotResolved -->
<StackPanel DataContext="{Binding CurrentComponent}">
<TextBlock Text="Download Links:" FontWeight="DemiBold" Margin="0, 0, 0, 0"
<TextBlock Text="Download Links:" FontWeight="DemiBold" Foreground="#3AAAFF" Margin="0, 0, 0, 0"
ToolTip.Tip="Click a link to open it in your browser."
IsVisible="{Binding ModLink, Converter={StaticResource ListToVisibilityConverter}}" />
<ItemsRepeater ItemsSource="{Binding ModLink}"
Expand Down Expand Up @@ -187,6 +189,7 @@
<MultiBinding
Converter="{StaticResource IndexConverter}">
<MultiBinding.Bindings>
<!-- ReSharper disable once Xaml.PossibleNullReferenceException Xaml.BindingWithContextNotResolved -->
<Binding
Path="$parent[ItemsRepeater].DataContext.Instructions" />
<Binding Path="." />
Expand Down Expand Up @@ -240,6 +243,7 @@
<TextBlock.Text>
<MultiBinding Converter="{StaticResource IndexConverter}">
<MultiBinding.Bindings>
<!-- ReSharper disable once Xaml.PossibleNullReferenceException Xaml.BindingWithContextNotResolved -->
<Binding
Path="$parent[ItemsRepeater].DataContext.Instructions" />
<Binding Path="." />
Expand Down Expand Up @@ -275,6 +279,7 @@
<TabItem x:Name="GuiEditTabItem" Header="GUI Edit">
<TabItem.Content>
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<!-- ReSharper disable once Xaml.BindingWithoutContextNotResolved -->
<StackPanel x:Name="GuiEditGrid" DataContext="{Binding CurrentComponent}">
<Expander Header="Information" IsExpanded="False">
<StackPanel>
Expand Down Expand Up @@ -351,6 +356,7 @@
<MultiBinding
Converter="{StaticResource IndexConverter}">
<MultiBinding.Bindings>
<!-- ReSharper disable once Xaml.PossibleNullReferenceException Xaml.BindingWithContextNotResolved -->
<Binding
Path="$parent[ItemsRepeater].DataContext.Instructions" />
<Binding Path="." />
Expand Down Expand Up @@ -499,6 +505,7 @@
<MultiBinding
Converter="{StaticResource IndexConverter}">
<MultiBinding.Bindings>
<!-- ReSharper disable once Xaml.PossibleNullReferenceException Xaml.BindingWithContextNotResolved -->
<Binding
Path="$parent[ItemsRepeater].DataContext.Options" />
<Binding Path="." />
Expand Down Expand Up @@ -572,6 +579,7 @@
<MultiBinding
Converter="{StaticResource IndexConverter}">
<MultiBinding.Bindings>
<!-- ReSharper disable once Xaml.PossibleNullReferenceException Xaml.BindingWithContextNotResolved -->
<Binding
Path="$parent[ItemsRepeater].DataContext.Instructions" />
<Binding
Expand Down Expand Up @@ -776,6 +784,7 @@
Content="Open Output Window" Click="OpenOutputWindow_Click" />
</Grid>

<!-- ReSharper disable once Xaml.BindingWithoutContextNotResolved -->
<StackPanel x:Name="MainConfigStackPanel" DataContext="{Binding MainConfigInstance}">
<CheckBox Content="Verbose Logging" IsChecked="{Binding debugLogging}" />
<CheckBox Content="Auto-Fix Config Errors" IsChecked="{Binding attemptFixes}" />
Expand Down
5 changes: 4 additions & 1 deletion KOTORModSync.GUI/Styles/Kotor2Style.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<Style Selector="TextBlock">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Foreground" Value="#33C3A2" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Margin" Value="0,5,0,2" />
<Setter Property="Foreground" Value="#33C3A2" />
</Style>

<Style Selector="SelectableTextBlock">
Expand Down Expand Up @@ -43,7 +43,9 @@
<Setter Property="Foreground" Value="#33C3A2" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="14" />
</Style>

<Style Selector="Expander">
<Setter Property="Background" Value="#09241D" />
<Setter Property="Foreground" Value="#33C3A2" />
Expand Down Expand Up @@ -103,6 +105,7 @@
<Setter Property="FontSize" Value="14" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>

<Style Selector="ComboBox">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Background" Value="#09241D" />
Expand Down
69 changes: 42 additions & 27 deletions KOTORModSync.GUI/Styles/KotorStyle.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@
<Style Selector="TextBlock">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Margin" Value="0,2" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Margin" Value="0,5,0,2" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>

<Style Selector="SelectableTextBlock">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Foreground" Value="#3AAAFF" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Margin" Value="0,5,0,2" />
</Style>

<Style Selector="Border">
<Setter Property="BorderBrush" Value="#3AAAFF" />
</Style>
Expand All @@ -26,7 +35,6 @@
<Setter Property="TextBlock.Foreground" Value="#A8B348" />
</Style>
<Style Selector="Button">
<Setter Property="Margin" Value="0,2" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="BorderBrush" Value="#062766" />
<Setter Property="Padding" Value="10" />
Expand All @@ -38,6 +46,24 @@
<Setter Property="FontSize" Value="14" />
</Style>

<Style Selector="Expander">
<Setter Property="Background" Value="#062766" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>
<Style Selector="Expander /template/ ContentPresenter">
<Setter Property="Background" Value="#010116" />
</Style>
<Style Selector="Expander:expanded /template/ Border#ExpanderContent">
<Setter Property="Background" Value="#010116" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="0" />
</Style>
<Style Selector="Expander /template/ Border#ExpanderContent">
<Setter Property="Background" Value="#010116" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="0" />
</Style>

<Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark">
<Setter Property="Foreground" Value="#A8B348" />
<Setter Property="Background" Value="#010116" />
Expand Down Expand Up @@ -71,33 +97,37 @@
</Style>
<Style Selector="TextBox">
<Setter Property="CaretBrush" Value="AliceBlue" />
<Setter Property="Margin" Value="2" />
<Setter Property="Padding" Value="2" />
<Setter Property="Background" Value="#010116" />
<Setter Property="FontFamily" Value="Verdana" />
<Setter Property="Foreground" Value="#3AAAFF" />
<Setter Property="BorderBrush" Value="#062766" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="FontSize" Value="14" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>

<Style Selector="ComboBox">
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Background" Value="#031332" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>
<Style Selector="CheckBox:pointerover /template/ Border#PART_BorderElement">
<Style Selector="CheckBox:pointerover">
<Setter Property="Foreground" Value="#3AAAFF" />
<Setter Property="BorderBrush" Value="#FFFFFF" />
<Setter Property="Background" Value="#010116" />
</Style>
<Style Selector="CheckBox:hover">
<Setter Property="Foreground" Value="#A8B348" />
<Setter Property="BorderBrush" Value="#A8B348" />
</Style>
<Style Selector="CheckBox:checked">
<Setter Property="BorderBrush" Value="#FFFFFF" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>
<Style Selector="CheckBox:pointerover">
<Setter Property="BorderBrush" Value="#FFFFFF" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>
<Style Selector="CheckBox">
<Setter Property="Foreground" Value="#3AAAFF" />
<Style Selector="CheckBox:unchecked">
<Setter Property="Foreground" Value="#A8B348" />
</Style>
<Style Selector="CheckBox:pointerover /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="#010116" />
</Style>

<Style Selector="ComboBox">
Expand Down Expand Up @@ -125,7 +155,6 @@
</Style>

<Style Selector="TreeView">
<Setter Property="Margin" Value="2" />
<Setter Property="MinWidth" Value="150" />
<Setter Property="Background" Value="#031332" />
</Style>
Expand All @@ -148,18 +177,4 @@
<Style Selector="Window">
<Setter Property="Background" Value="#000116" />
</Style>

<Style Selector="Expander">
<Setter Property="Background" Value="#062766" />
<Setter Property="Foreground" Value="#3AAAFF" />
</Style>
<Style Selector="Expander /template/ ContentPresenter">
<Setter Property="Background" Value="#010116" />
</Style>
<Style Selector="Expander:expanded /template/ Border#ExpanderContent">
<Setter Property="Background" Value="#010116" />
</Style>
<Style Selector="Expander:expanded /template/ Border#ExpanderContent">
<Setter Property="BorderThickness" Value="0" />
</Style>
</Styles>

0 comments on commit 00b905a

Please sign in to comment.