real time mask settings

This commit is contained in:
qhy040404
2024-03-07 23:36:19 +08:00
parent 3133478fca
commit 4554769f38
3 changed files with 8 additions and 15 deletions

View File

@@ -70,7 +70,7 @@
Foreground="LightGray"
IsHitTestVisible="False"
VerticalScrollBarVisibility="Hidden"
Visibility="{Binding LogTextBoxVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.ShowLogBox, Converter={StaticResource BooleanToVisibilityConverter}}" />
</ContentControl>
<!--<ContentControl Width="230"
@@ -115,7 +115,7 @@
Height="{Binding UidCoverRect.Height, Mode=OneWay}"
Fill="White"
IsHitTestVisible="False"
Visibility="{Binding UidCoverVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.UidCoverEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
<!-- 方位 -->
<Label Canvas.Left="{Binding EastPoint.X, Mode=OneWay}"
@@ -126,7 +126,7 @@
FontStretch="Medium"
FontWeight="DemiBold"
Foreground="White"
Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
<Label Canvas.Left="{Binding SouthPoint.X, Mode=OneWay}"
Canvas.Top="{Binding SouthPoint.Y, Mode=OneWay}"
HorizontalAlignment="Center"
@@ -135,7 +135,7 @@
FontStretch="Medium"
FontWeight="DemiBold"
Foreground="White"
Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
<Label Canvas.Left="{Binding WestPoint.X, Mode=OneWay}"
Canvas.Top="{Binding WestPoint.Y, Mode=OneWay}"
HorizontalAlignment="Center"
@@ -144,7 +144,7 @@
FontStretch="Medium"
FontWeight="DemiBold"
Foreground="White"
Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
<Label Canvas.Left="{Binding NorthPoint.X, Mode=OneWay}"
Canvas.Top="{Binding NorthPoint.Y, Mode=OneWay}"
HorizontalAlignment="Center"
@@ -153,7 +153,7 @@
FontStretch="Medium"
FontWeight="DemiBold"
Foreground="White"
Visibility="{Binding DirectionsVisibility, Converter={StaticResource BooleanToVisibilityConverter}}" />
Visibility="{Binding Config.MaskWindowConfig.DirectionsEnabled, Converter={StaticResource BooleanToVisibilityConverter}}" />
</Canvas>
</AdornerDecorator>

View File

@@ -43,7 +43,7 @@
Grid.Column="0"
Foreground="{ui:ThemeResource TextFillColorTertiaryBrush}"
TextWrapping="Wrap"
Text="重启软件后生效,独占全屏模式下此模式不一定生效" />
Text="实时生效,独占全屏模式下此模式不一定生效" />
<ui:ToggleSwitch
Grid.Row="0"
Grid.RowSpan="2"

View File

@@ -29,10 +29,6 @@ namespace BetterGenshinImpact.ViewModel
[ObservableProperty] private Point _northPoint = new(150, -9);
[ObservableProperty] private bool _logTextBoxVisibility = true;
[ObservableProperty] private bool _uidCoverVisibility = true;
[ObservableProperty] private bool _directionsVisibility = true;
public MaskWindowViewModel()
{
WeakReferenceMessenger.Default.Register<PropertyChangedMessage<object>>(this, (sender, msg) =>
@@ -83,10 +79,7 @@ namespace BetterGenshinImpact.ViewModel
InitConfig();
if (Config != null)
{
LogTextBoxVisibility = Config.MaskWindowConfig.ShowLogBox;
UidCoverVisibility = Config.MaskWindowConfig.UidCoverEnabled;
DirectionsVisibility = Config.MaskWindowConfig.DirectionsEnabled;
OnPropertyChanged(nameof(Config));
// 比较特殊,必须要启动过任务调度器才能够获取到缩放信息
if (TaskContext.Instance().SystemInfo != null)
{