1.1.4 -> 0.0.1 第4次更新

This commit is contained in:
Space Time 2025-03-01 21:24:25 +08:00
parent d33a08ea14
commit 31b8e39751
2 changed files with 10 additions and 5 deletions

View File

@ -61,11 +61,12 @@
<ColumnDefinition Width="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainProxyColumnWidthConv}}" /> <ColumnDefinition Width="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainProxyColumnWidthConv}}" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button IsDefault="True" <Button x:Name="BrowserButton"
IsDefault="True"
Grid.Column="0" Margin="5" Grid.Column="0" Margin="5"
Content="{x:Static consts:MainConst.BrowserButtonContent}" Content="{x:Static consts:MainConst.BrowserButtonContent}"
ToolTip.Tip="{x:Static consts:MainConst.BrowserButtonToolTip}" ToolTip.Tip="{x:Static consts:MainConst.BrowserButtonToolTip}"
Click="LaunchButton_Click" PointerPressed="LaunchButton_PointerPressed"> Click="LaunchButton_Click">
<Button.IsEnabled> <Button.IsEnabled>
<MultiBinding Converter="{x:Static convs:MainConv.MainBrowserButtonIsEnabledConv}"> <MultiBinding Converter="{x:Static convs:MainConv.MainBrowserButtonIsEnabledConv}">
<Binding Path="BrowserPath" /> <Binding Path="BrowserPath" />
@ -76,7 +77,7 @@
<Button x:Name="NginxButton" <Button x:Name="NginxButton"
Grid.Column="1" Margin="5" Grid.Column="1" Margin="5"
IsVisible="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainAdminControlVisibilityConv}}" IsVisible="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainAdminControlVisibilityConv}}"
Click="LaunchButton_Click" PointerPressed="LaunchButton_PointerPressed"> Click="LaunchButton_Click">
<Button.IsEnabled> <Button.IsEnabled>
<MultiBinding Converter="{x:Static convs:MainConv.MainNginxButtonIsEnabledConv}"> <MultiBinding Converter="{x:Static convs:MainConv.MainNginxButtonIsEnabledConv}">
<Binding Path="IsConginxExist" /> <Binding Path="IsConginxExist" />
@ -106,7 +107,7 @@
Grid.Column="2" Margin="5" Grid.Column="2" Margin="5"
IsVisible="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainAdminControlVisibilityConv}}" IsVisible="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainAdminControlVisibilityConv}}"
ToolTip.Tip="{Binding IsMihomoRunning, Converter={x:Static convs:MainConv.MainMihomoButtonToolTipConv}}" ToolTip.Tip="{Binding IsMihomoRunning, Converter={x:Static convs:MainConv.MainMihomoButtonToolTipConv}}"
Click="LaunchButton_Click" PointerPressed="LaunchButton_PointerPressed"> Click="LaunchButton_Click">
<Button.IsEnabled> <Button.IsEnabled>
<MultiBinding Converter="{x:Static convs:MainConv.MainMihomoButtonIsEnabledConv}"> <MultiBinding Converter="{x:Static convs:MainConv.MainMihomoButtonIsEnabledConv}">
<Binding Path="IsComihomoExist" /> <Binding Path="IsComihomoExist" />

View File

@ -75,6 +75,10 @@ public partial class MainWin : Window
{ {
await Task.Run(async () => await Task.Run(async () =>
{ {
BrowserButton.AddHandler(Button.PointerPressedEvent, LaunchButton_PointerPressed, handledEventsToo: true);
NginxButton.AddHandler(Button.PointerPressedEvent, LaunchButton_PointerPressed, handledEventsToo: true);
MihomoButton.AddHandler(Button.PointerPressedEvent, LaunchButton_PointerPressed, handledEventsToo: true);
ProxyTimer.Tick += ProxyTimer_Tick; ProxyTimer.Tick += ProxyTimer_Tick;
CealHostWatcher.Changed += CealHostWatcher_Changed; CealHostWatcher.Changed += CealHostWatcher_Changed;
NginxConfWatcher.Changed += NginxConfWatcher_Changed; NginxConfWatcher.Changed += NginxConfWatcher_Changed;
@ -174,7 +178,7 @@ public partial class MainWin : Window
else else
BrowserButtonHoldTimer_Tick(sender == null, EventArgs.Empty); BrowserButtonHoldTimer_Tick(sender == null, EventArgs.Empty);
} }
private void LaunchButton_PointerPressed(object sender, PointerPressedEventArgs e) private void LaunchButton_PointerPressed(object? sender, PointerPressedEventArgs e)
{ {
Button senderButton = (Button)sender; Button senderButton = (Button)sender;