sim0n00ps/OF-DL
52
58
Fork 19
Code Issues 30 Pull Requests Actions Packages Projects 1 Releases 17 Wiki Activity

Creator config modal improvements

Browse Source
This commit is contained in:
whimsical-c4lic0 2026-02-14 12:41:01 -06:00
parent 85e299db41
commit 162811b267
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OF DL.Gui/Views/MainWindow.axaml
View File

@ -848,7 +848,8 @@
<Grid Grid.RowSpan="3" <Grid Grid.RowSpan="3"
IsVisible="{Binding CreatorConfigEditor.ModalViewModel.IsOpen}" IsVisible="{Binding CreatorConfigEditor.ModalViewModel.IsOpen}"
Background="#80000000" Background="#80000000"
ZIndex="1000"> ZIndex="1000"
PointerPressed="OnModalOverlayClicked">
<Border Background="#FFFFFF" <Border Background="#FFFFFF"
BorderBrush="#DDE5F3" BorderBrush="#DDE5F3"
BorderThickness="1" BorderThickness="1"
@ -858,7 +859,8 @@
MaxHeight="750" MaxHeight="750"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
BoxShadow="0 8 32 0 #26000000"> BoxShadow="0 8 32 0 #26000000"
PointerPressed="OnModalContentClicked">
<ScrollViewer DataContext="{Binding CreatorConfigEditor.ModalViewModel}"> <ScrollViewer DataContext="{Binding CreatorConfigEditor.ModalViewModel}">
<StackPanel Spacing="14" Margin="8,4,8,4" x:DataType="vm:CreatorConfigModalViewModel"> <StackPanel Spacing="14" Margin="8,4,8,4" x:DataType="vm:CreatorConfigModalViewModel">
<TextBlock FontSize="18" <TextBlock FontSize="18"
@ -887,6 +889,8 @@
<StackPanel Spacing="8"> <StackPanel Spacing="8">
<TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Paid Post Filename Format" /> <TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Paid Post Filename Format" />
<TextBox Text="{Binding PaidPostFileNameFormat}"
Watermark="Optional: override global paid post format" />
<Grid ColumnDefinitions="*,Auto"> <Grid ColumnDefinitions="*,Auto">
<ComboBox Grid.Column="0" <ComboBox Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -898,8 +902,6 @@
Content="Insert" Content="Insert"
Command="{Binding InsertPaidPostVariableCommand}" /> Command="{Binding InsertPaidPostVariableCommand}" />
</Grid> </Grid>
<TextBox Text="{Binding PaidPostFileNameFormat}"
Watermark="Optional: override global paid post format" />
<Border Padding="8" <Border Padding="8"
Background="#F5F8FE" Background="#F5F8FE"
BorderBrush="#D8E3F4" BorderBrush="#D8E3F4"
@ -929,6 +931,8 @@
<StackPanel Spacing="8"> <StackPanel Spacing="8">
<TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Post Filename Format" /> <TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Post Filename Format" />
<TextBox Text="{Binding PostFileNameFormat}"
Watermark="Optional: override global post format" />
<Grid ColumnDefinitions="*,Auto"> <Grid ColumnDefinitions="*,Auto">
<ComboBox Grid.Column="0" <ComboBox Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -940,8 +944,6 @@
Content="Insert" Content="Insert"
Command="{Binding InsertPostVariableCommand}" /> Command="{Binding InsertPostVariableCommand}" />
</Grid> </Grid>
<TextBox Text="{Binding PostFileNameFormat}"
Watermark="Optional: override global post format" />
<Border Padding="8" <Border Padding="8"
Background="#F5F8FE" Background="#F5F8FE"
BorderBrush="#D8E3F4" BorderBrush="#D8E3F4"
@ -971,6 +973,8 @@
<StackPanel Spacing="8"> <StackPanel Spacing="8">
<TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Paid Message Filename Format" /> <TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Paid Message Filename Format" />
<TextBox Text="{Binding PaidMessageFileNameFormat}"
Watermark="Optional: override global paid message format" />
<Grid ColumnDefinitions="*,Auto"> <Grid ColumnDefinitions="*,Auto">
<ComboBox Grid.Column="0" <ComboBox Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -982,8 +986,6 @@
Content="Insert" Content="Insert"
Command="{Binding InsertPaidMessageVariableCommand}" /> Command="{Binding InsertPaidMessageVariableCommand}" />
</Grid> </Grid>
<TextBox Text="{Binding PaidMessageFileNameFormat}"
Watermark="Optional: override global paid message format" />
<Border Padding="8" <Border Padding="8"
Background="#F5F8FE" Background="#F5F8FE"
BorderBrush="#D8E3F4" BorderBrush="#D8E3F4"
@ -1013,6 +1015,8 @@
<StackPanel Spacing="8"> <StackPanel Spacing="8">
<TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Message Filename Format" /> <TextBlock FontWeight="SemiBold" Foreground="#1F2A44" Text="Message Filename Format" />
<TextBox Text="{Binding MessageFileNameFormat}"
Watermark="Optional: override global message format" />
<Grid ColumnDefinitions="*,Auto"> <Grid ColumnDefinitions="*,Auto">
<ComboBox Grid.Column="0" <ComboBox Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -1024,8 +1028,6 @@
Content="Insert" Content="Insert"
Command="{Binding InsertMessageVariableCommand}" /> Command="{Binding InsertMessageVariableCommand}" />
</Grid> </Grid>
<TextBox Text="{Binding MessageFileNameFormat}"
Watermark="Optional: override global message format" />
<Border Padding="8" <Border Padding="8"
Background="#F5F8FE" Background="#F5F8FE"
BorderBrush="#D8E3F4" BorderBrush="#D8E3F4"

19
OF DL.Gui/Views/MainWindow.axaml.cs
View File

@ -1,5 +1,6 @@
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
@ -103,4 +104,22 @@ public partial class MainWindow : Window
vm.SetDownloadPath(selectedFolder.Name); vm.SetDownloadPath(selectedFolder.Name);
} }
private void OnModalOverlayClicked(object? sender, PointerPressedEventArgs e)
{
// Only handle clicks on the overlay itself (the Grid background)
if (DataContext is not MainWindowViewModel vm)
{
return;
}
// Execute cancel command on the modal
vm.CreatorConfigEditor.ModalViewModel?.CancelCommand?.Execute(null);
}
private void OnModalContentClicked(object? sender, PointerPressedEventArgs e)
{
// Stop the event from bubbling up to the overlay
e.Handled = true;
}
} }