Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

自定义范围的描述和UI调整

Browse Source
This commit is contained in:
ZouJin 2023-09-10 23:16:11 +08:00
parent 89802e4b8d
commit ea35d430b1
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -377,8 +377,7 @@
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" /> <RowDefinition Height="35" />
<RowDefinition Height="35" /> <RowDefinition Height="Auto" />
<RowDefinition Height="35" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<pu:Switch x:Name="CalFunctionBox" Grid.Column="2" Background="Transparent" <pu:Switch x:Name="CalFunctionBox" Grid.Column="2" Background="Transparent"
BorderBrush="{DynamicResource PrimaryDark}" BoxHeight="18" BoxWidth="35" BorderBrush="{DynamicResource PrimaryDark}" BoxHeight="18" BoxWidth="35"
@ -493,36 +492,35 @@
</ComboBoxItem> </ComboBoxItem>
</ComboBox> </ComboBox>
</Grid> </Grid>
<Grid Grid.Row="7" Grid.RowSpan="2" Grid.Column="3"> <Grid Grid.Row="7" Grid.Column="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="35" /> <RowDefinition Height="Auto" />
<RowDefinition Height="35" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="{ll:Str '当前移动区域：'}" /> <TextBlock Grid.Row="0" Text="{ll:Str '当前移动区域：'}" />
<TextBlock x:Name="textMoveArea" Grid.Column="1" Grid.ColumnSpan="2" Text="{ll:Str '主屏幕'}"/> <TextBlock x:Name="textMoveArea" Grid.Column="1" Grid.ColumnSpan="2"
<Button x:Name="BtnSetMoveArea_Default" Grid.Row="1" Grid.Column="0" Margin="5,5,5,5" Padding="1" Text="{ll:Str '主屏幕'}" />
pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}" <Button x:Name="BtnSetMoveArea_Default" Grid.Row="1" Grid.Column="0" Margin="5,5,5,5"
Click="BtnSetMoveArea_Default_Click" Content="{ll:Str 重置为主屏}"/> Padding="1" pu:ButtonHelper.CornerRadius="4"
<Button x:Name="BtnSetMoveArea_DetectScreen" Grid.Row="1" Grid.Column="1" Margin="5,5,5,5" Padding="1" Background="{DynamicResource SecondaryLight}"
pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}" Click="BtnSetMoveArea_Default_Click" Content="{ll:Str 重置为主屏}"
Click="BtnSetMoveArea_DetectScreen_Click" Content="{ll:Str 设为桌宠屏幕}" ToolTip="{ll:Str `设置桌宠只在主屏幕进行移动`}" />
ToolTip="{ll:Str 当屏幕分辨率不为100%时可能识别有误}"/> <Button x:Name="BtnSetMoveArea_DetectScreen" Grid.Row="1" Grid.Column="1"
<Button x:Name="BtnSetMoveArea_Window" Grid.Row="1" Grid.Column="2" Margin="5,5,5,5" Padding="1" Margin="5,5,5,5" Padding="1" pu:ButtonHelper.CornerRadius="4"
pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}" Background="{DynamicResource SecondaryLight}"
Click="BtnSetMoveArea_Window_Click" Content="{ll:Str 设为窗口范围}"> Click="BtnSetMoveArea_DetectScreen_Click" Content="{ll:Str 设为当前屏幕}"
<Button.ToolTip> ToolTip="{ll:Str '设置桌宠只在当前桌宠所在的屏幕范围进行移动'}" />
<TextBlock> <Button x:Name="BtnSetMoveArea_Window" Grid.Row="1" Grid.Column="2" Margin="5,5,5,5"
<TextBlock Text="{ll:Str 使用设置窗口框选范围后点击}"/> Padding="1" pu:ButtonHelper.CornerRadius="4"
<LineBreak /> Background="{DynamicResource SecondaryLight}"
<TextBlock Text="{ll:Str 注：双击顶端可最大化设置页}"/> Click="BtnSetMoveArea_Window_Click" Content="{ll:Str 自定移动范围}"
</TextBlock> ToolTip="{ll:Str '手动设置桌宠可移动范围'}"
</Button.ToolTip> />
</Button>
</Grid> </Grid>
<TextBlock Grid.Row="0" VerticalAlignment="Center" Text="{ll:Str 数据计算}" /> <TextBlock Grid.Row="0" VerticalAlignment="Center" Text="{ll:Str 数据计算}" />
<TextBlock Grid.Row="1" VerticalAlignment="Center" Text="{ll:Str 显示状态}" /> <TextBlock Grid.Row="1" VerticalAlignment="Center" Text="{ll:Str 显示状态}" />