Skip to content

Commit

Permalink
Schedule can be edited while in progress fix LorisYounger#392
Browse files Browse the repository at this point in the history
  • Loading branch information
LorisYounger committed Jun 9, 2024
1 parent 5bfbcd3 commit 1f82987
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,9 @@
<ScrollViewer Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2"
Margin="10,0,0,0">
<TextBlock x:Name="rpnDescribe"
Text="游玩《虚拟桌宠模拟器》,参加桌宠 ChatVPet 项目。任务目标,即刻拯救桌宠!" TextWrapping="Wrap" />
</ScrollViewer>
Text="游玩《虚拟桌宠模拟器》,参加桌宠 ChatVPet 项目。任务目标,即刻拯救桌宠!"
TextWrapping="Wrap" />
</ScrollViewer>
<TextBlock Grid.Row="5" Text="{ll:Str '办理费用'}" VerticalAlignment="Bottom" />
<TextBlock x:Name="rpnPrice" Grid.Row="5" Grid.Column="2"
HorizontalAlignment="Right" VerticalAlignment="Center"
Expand All @@ -348,7 +349,8 @@
<RowDefinition />
</Grid.RowDefinitions>
<TextBlock Margin="7,7,0,0" Text="{ll:Str '日程安排'}" />
<ScrollViewer Grid.Row="1">
<ScrollViewer Grid.Row="1"
IsEnabled="{Binding IsChecked, ElementName=btnStartSchedule, Converter={x:Static pu:Converters.TrueToFalseConverter} }">
<StackPanel Margin="20,7,7,7">
<ItemsControl x:Name="icSchedule"
ItemTemplateSelector="{StaticResource ScheduleItemTemplateSelector}">
Expand Down
Binary file modified vpeticon.ase
Binary file not shown.

0 comments on commit 1f82987

Please sign in to comment.