Skip to content

Commit b455154

Browse files
committed
希望【养成计算】的添加更方便快捷 #59
1 parent 4a3d517 commit b455154

File tree

4 files changed

+61
-11
lines changed

4 files changed

+61
-11
lines changed

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/Control/Image/CachedImage.xaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
BorderBrush="{TemplateBinding BorderBrush}"
1616
BorderThickness="{TemplateBinding BorderThickness}"
1717
CornerRadius="{TemplateBinding CornerRadius}">
18-
<Grid.ContextFlyout>
19-
<MenuFlyout>
20-
<MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding SourceName}"/>
21-
<MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding CachedName}"/>
22-
<MenuFlyoutItem Command="{Binding CopyToClipboardCommand, RelativeSource={RelativeSource TemplatedParent}}" Text="{shuxm:ResourceString Name=UIXamlControlCachedImageCopyImage}"/>
23-
</MenuFlyout>
24-
</Grid.ContextFlyout>
2518
<Image
2619
Name="Image"
2720
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/AvatarPropertyPage.xaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
xmlns:shva="using:Snap.Hutao.Remastered.ViewModel.AvatarProperty"
2121
d:DataContext="{d:DesignInstance shva:AvatarPropertyViewModel}"
2222
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
23-
mc:Ignorable="d">
23+
mc:Ignorable="d"
24+
x:Name="RootPage">
2425

2526
<mxi:Interaction.Behaviors>
2627
<shuxb:InvokeCommandOnLoadedBehavior Command="{Binding LoadCommand}"/>
@@ -82,6 +83,15 @@
8283

8384
<DataTemplate x:Key="AvatarGridViewTemplate" x:DataType="shva:AvatarView">
8485
<Grid Style="{ThemeResource GridShimmerStyle}">
86+
<Grid.ContextFlyout>
87+
<MenuFlyout>
88+
<MenuFlyoutItem
89+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
90+
CommandParameter="{Binding}"
91+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
92+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
93+
</MenuFlyout>
94+
</Grid.ContextFlyout>
8595

8696
<Border
8797
Grid.ColumnSpan="3"
@@ -190,6 +200,15 @@
190200

191201
<DataTemplate x:Key="AvatarListViewTemplate" x:DataType="shva:AvatarView">
192202
<Grid>
203+
<Grid.ContextFlyout>
204+
<MenuFlyout>
205+
<MenuFlyoutItem
206+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
207+
CommandParameter="{Binding}"
208+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
209+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
210+
</MenuFlyout>
211+
</Grid.ContextFlyout>
193212
<Grid.ColumnDefinitions>
194213
<ColumnDefinition Width="auto"/>
195214
<ColumnDefinition Width="*"/>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/WikiAvatarPage.xaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
xmlns:shvw="using:Snap.Hutao.Remastered.ViewModel.Wiki"
2626
d:DataContext="{d:DesignInstance Type=shvw:WikiAvatarViewModel}"
2727
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
28-
mc:Ignorable="d">
28+
mc:Ignorable="d"
29+
x:Name="RootPage">
2930
<mxi:Interaction.Behaviors>
3031
<shuxb:InvokeCommandOnLoadedBehavior Command="{Binding LoadCommand}"/>
3132
</mxi:Interaction.Behaviors>
@@ -112,6 +113,15 @@
112113

113114
<DataTemplate x:Key="AvatarListTemplate" x:DataType="shmma:Avatar">
114115
<Grid>
116+
<Grid.ContextFlyout>
117+
<MenuFlyout>
118+
<MenuFlyoutItem
119+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
120+
CommandParameter="{Binding}"
121+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
122+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
123+
</MenuFlyout>
124+
</Grid.ContextFlyout>
115125
<Grid.ColumnDefinitions>
116126
<ColumnDefinition Width="auto"/>
117127
<ColumnDefinition/>
@@ -289,6 +299,15 @@
289299

290300
<DataTemplate x:Key="AvatarGridTemplate" x:DataType="shmma:Avatar">
291301
<shuxcc:VerticalCard Width="82">
302+
<shuxcc:VerticalCard.ContextFlyout>
303+
<MenuFlyout>
304+
<MenuFlyoutItem
305+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
306+
CommandParameter="{Binding}"
307+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
308+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
309+
</MenuFlyout>
310+
</shuxcc:VerticalCard.ContextFlyout>
292311
<shuxcc:VerticalCard.Top>
293312
<shuxc:ItemIcon Icon="{Binding Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
294313
</shuxcc:VerticalCard.Top>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/WikiWeaponPage.xaml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
xmlns:shvw="using:Snap.Hutao.Remastered.ViewModel.Wiki"
2222
d:DataContext="{d:DesignInstance Type=shvw:WikiWeaponViewModel}"
2323
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
24-
mc:Ignorable="d">
24+
mc:Ignorable="d"
25+
x:Name="RootPage">
2526
<mxi:Interaction.Behaviors>
2627
<shuxb:InvokeCommandOnLoadedBehavior Command="{Binding LoadCommand}"/>
2728
</mxi:Interaction.Behaviors>
@@ -70,6 +71,15 @@
7071

7172
<DataTemplate x:Key="WeaponListTemplate" x:DataType="shmmw:Weapon">
7273
<Grid>
74+
<Grid.ContextFlyout>
75+
<MenuFlyout>
76+
<MenuFlyoutItem
77+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
78+
CommandParameter="{Binding}"
79+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
80+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
81+
</MenuFlyout>
82+
</Grid.ContextFlyout>
7383
<Grid.ColumnDefinitions>
7484
<ColumnDefinition Width="auto"/>
7585
<ColumnDefinition/>
@@ -146,6 +156,15 @@
146156

147157
<DataTemplate x:Key="WeaponGridTemplate" x:DataType="shmmw:Weapon">
148158
<shuxcc:VerticalCard Width="82">
159+
<shuxcc:VerticalCard.ContextFlyout>
160+
<MenuFlyout>
161+
<MenuFlyoutItem
162+
Command="{Binding Path=DataContext.CultivateCommand, ElementName=RootPage}"
163+
CommandParameter="{Binding}"
164+
Icon="{shuxm:FontIcon Glyph=&#xE8EF;}"
165+
Text="{shuxm:ResourceString Name=ViewPageCultivateCalculate}"/>
166+
</MenuFlyout>
167+
</shuxcc:VerticalCard.ContextFlyout>
149168
<shuxcc:VerticalCard.Top>
150169
<shuxc:ItemIcon Icon="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
151170
</shuxcc:VerticalCard.Top>
@@ -419,4 +438,4 @@
419438

420439
</Grid>
421440
</shuxc:StandardView>
422-
</shuxc:ScopedPage>
441+
</shuxc:ScopedPage>

0 commit comments

Comments
 (0)