Skip to content

Add mouse over configuration options for custom home view and add more button ids #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shivansps merged 2 commits into from
Jan 27, 2025
Merged

Add mouse over configuration options for custom home view and add more button ids #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c85993c
Add mouse over configuration options for custom home view and add mor…
Shivansps Jan 27, 2025
dbaeca0
fix typo
Shivansps Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Knossos.NET/Models/CustomLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ public HomeCustomButtonConfig()
{
}

public string? ButtonID { get; set; } = null; //ButtonLaunch, ButtonModify, ButtonUpdate, ButtonInstall, ButtonInfo, ButtonDetails, ButtonSettings
/// <summary>
/// ButtonLaunch, ButtonModify, ButtonUpdate, ButtonInstall, ButtonInfo, ButtonDetails, ButtonSettings, ButtonLaunchAdvanced
/// ButtonPlayVR, ButtonFred2, ButtonQtFred, ButtonDebug, ButtonFred2Debug, ButtonQtFredDebug, ButtonLogFile
/// </summary>
public string? ButtonID { get; set; } = null;
public string? DisplayText { get; set; } = null;
public string? ToolTip { get; set; } = null;
public int? FontSize { get; set; } = null;
public string? BackgroundHexColor { get; set; } = null; //#CD3632 hex color value
public string? ForegroundHexColor { get; set; } = null; //#CD3632 hex color value
public string? BorderHexColer { get; set; } = null; //#CD3632 hex color value
public string? BorderHexColor { get; set; } = null; //#CD3632 hex color value
public string? MouseOverBackgroundHexColor { get; set; } = null; //#CD3632 hex color value
public string? MouseOverForegroundHexColor { get; set; } = null; //#CD3632 hex color value
public string? MouseOverBorderHexColor { get; set; } = null; //#CD3632 hex color value
}

public struct CustomMenuButton
Expand Down
20 changes: 10 additions & 10 deletions Knossos.NET/Views/CustomHomeView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@
<!-- Installed -->
<StackPanel IsVisible="{Binding Installed}" Grid.Column="2" Margin="20" VerticalAlignment="Center">
<WrapPanel Margin="5" HorizontalAlignment="Right">
<Button Grid.Column="0" HorizontalAlignment="Left" Width="16" Height="50"
Margin="1" ToolTip.Tip="Advanced Options" Background="{Binding Background, ElementName=ButtonLaunch}" BorderBrush="{Binding BorderBrush, ElementName=ButtonLaunch}">
<PathIcon Height="15" Width="10" Foreground="{Binding Foreground, ElementName=ButtonLaunch}" Data="{StaticResource ChevronLeftRegular}" />
<Button Grid.Column="0" HorizontalAlignment="Left" Width="16" Height="50" Classes="Accept"
Margin="1" ToolTip.Tip="Advanced Options" Name="ButtonLaunchAdvanced">
<PathIcon Height="15" Width="10" Foreground="{Binding Foreground, ElementName=ButtonLaunchAdvanced}" Data="{StaticResource ChevronLeftRegular}" />
<Button.Flyout>
<Flyout Placement="Left">
<StackPanel>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="playvr" Content="Play in VR" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="fred2" Content="Fred2" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="qtfred" Content="QtFred" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="debug" Content="FSO Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="fred2debug" Content="Fred2 Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="qtfreddebug" Content="QtFred Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Command="{Binding HardcodedButtonCommand}" CommandParameter="logfile" Content="Open Logfile" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonPlayVR" Command="{Binding HardcodedButtonCommand}" CommandParameter="playvr" Content="Play in VR" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonFred2" Command="{Binding HardcodedButtonCommand}" CommandParameter="fred2" Content="Fred2" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonQtFred" Command="{Binding HardcodedButtonCommand}" CommandParameter="qtfred" Content="QtFred" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonDebug" Command="{Binding HardcodedButtonCommand}" CommandParameter="debug" Content="FSO Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonFred2Debug" Command="{Binding HardcodedButtonCommand}" CommandParameter="fred2debug" Content="Fred2 Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonQtFredDebug" Command="{Binding HardcodedButtonCommand}" CommandParameter="qtfreddebug" Content="QtFred Debug" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
<Button Name="ButtonLogFile" Command="{Binding HardcodedButtonCommand}" CommandParameter="logfile" Content="Open Logfile" HorizontalAlignment="Center" Margin="0,2,0,0" Width="115" ></Button>
</StackPanel>
</Flyout>
</Button.Flyout>
Expand Down
26 changes: 23 additions & 3 deletions Knossos.NET/Views/CustomHomeView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Avalonia.Controls;
using Avalonia.Controls.Presenters;
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Styling;
using Knossos.NET.Converters;
using Knossos.NET.Models;
using System;
Expand Down Expand Up @@ -85,7 +87,7 @@ public CustomHomeView()
var button = this.FindControl<Button>(config.ButtonID!);
if (button != null)
{
if (config.DisplayText != null)
if (config.DisplayText != null && config.ButtonID != "ButtonLaunchAdvanced")
button.Content = config.DisplayText;
if (config.ToolTip != null)
ToolTip.SetTip(button, config.ToolTip);
Expand All @@ -95,8 +97,26 @@ public CustomHomeView()
button.Background = SolidColorBrush.Parse(config.BackgroundHexColor);
if (config.ForegroundHexColor != null)
button.Foreground = SolidColorBrush.Parse(config.ForegroundHexColor);
if (config.BorderHexColer != null)
button.BorderBrush = SolidColorBrush.Parse(config.BorderHexColer);
if (config.BorderHexColor != null)
button.BorderBrush = SolidColorBrush.Parse(config.BorderHexColor);

if (config.MouseOverBackgroundHexColor != null || config.MouseOverForegroundHexColor != null || config.MouseOverBorderHexColor != null)
{
Style style = new Style(x => x.OfType<Button>().Class(":pointerover").Template().OfType<ContentPresenter>());
if(config.MouseOverBackgroundHexColor != null)
{
style.Setters.Add(new Setter(Button.BackgroundProperty, SolidColorBrush.Parse(config.MouseOverBackgroundHexColor)));
}
if(config.MouseOverForegroundHexColor != null)
{
style.Setters.Add(new Setter(Button.ForegroundProperty, SolidColorBrush.Parse(config.MouseOverForegroundHexColor)));
}
if (config.MouseOverBorderHexColor != null)
{
style.Setters.Add(new Setter(Button.BorderBrushProperty, SolidColorBrush.Parse(config.MouseOverBorderHexColor)));
}
button.Styles.Add(style);
}
}
else
{
Expand Down