Skip to content

Commit cb94264

Browse files
RichasyRichasy
authored
修复播放器全屏时的UI问题 (Richasy#214)
1 parent f1fcf69 commit cb94264

15 files changed

Lines changed: 33 additions & 14 deletions

File tree

‎src/App/App.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@
142142
<Compile Include="Controls\Player\BiliPlayerTransportControls\BiliPlayerTransportControls.Properties.cs" />
143143
<Compile Include="Controls\Player\BiliPlayer\BiliPlayer.cs" />
144144
<Compile Include="Controls\Player\BiliPlayer\BiliPlayer.Properties.cs" />
145-
<Compile Include="Controls\CardPanel\CardPanel.Fields.cs" />
146-
<Compile Include="Controls\CardPanel\CardPanel.Properties.cs" />
147-
<Compile Include="Controls\CardPanel\CardPanelAutomationPeer.cs" />
148-
<Compile Include="Controls\CardPanel\CardPanelStateChangedEventArgs.cs" />
145+
<Compile Include="Controls\App\CardPanel\CardPanel.Fields.cs" />
146+
<Compile Include="Controls\App\CardPanel\CardPanel.Properties.cs" />
147+
<Compile Include="Controls\App\CardPanel\CardPanelAutomationPeer.cs" />
148+
<Compile Include="Controls\App\CardPanel\CardPanelStateChangedEventArgs.cs" />
149149
<Compile Include="Controls\Common\ArticleItem.xaml.cs">
150150
<DependentUpon>ArticleItem.xaml</DependentUpon>
151151
</Compile>
@@ -255,7 +255,7 @@
255255
<Compile Include="Controls\Banner\BannerView.xaml.cs">
256256
<DependentUpon>BannerView.xaml</DependentUpon>
257257
</Compile>
258-
<Compile Include="Controls\CardPanel\CardPanel.cs" />
258+
<Compile Include="Controls\App\CardPanel\CardPanel.cs" />
259259
<Compile Include="Controls\App\ErrorPanel.xaml.cs">
260260
<DependentUpon>ErrorPanel.xaml</DependentUpon>
261261
</Compile>
@@ -803,7 +803,7 @@
803803
<SubType>Designer</SubType>
804804
<Generator>MSBuild:Compile</Generator>
805805
</Page>
806-
<Page Include="Controls\CardPanel\CardPanel.xaml">
806+
<Page Include="Controls\App\CardPanel\CardPanel.xaml">
807807
<SubType>Designer</SubType>
808808
<Generator>MSBuild:Compile</Generator>
809809
</Page>

‎src/App/App.xaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
x:Class="Richasy.Bili.App.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:converter="using:Richasy.Bili.App.Resources.Converter"
6-
xmlns:uwp="using:Richasy.Shadow.Uwp">
5+
xmlns:converter="using:Richasy.Bili.App.Resources.Converter">
76
<Application.Resources>
87
<ResourceDictionary>
98
<ResourceDictionary.MergedDictionaries>

src/App/Controls/CardPanel/CardPanel.Fields.cs renamed to src/App/Controls/App/CardPanel/CardPanel.Fields.cs

File renamed without changes.

src/App/Controls/CardPanel/CardPanel.Properties.cs renamed to src/App/Controls/App/CardPanel/CardPanel.Properties.cs

File renamed without changes.

src/App/Controls/CardPanel/CardPanel.cs renamed to src/App/Controls/App/CardPanel/CardPanel.cs

File renamed without changes.

src/App/Controls/CardPanel/CardPanel.xaml renamed to src/App/Controls/App/CardPanel/CardPanel.xaml

File renamed without changes.

src/App/Controls/CardPanel/CardPanelAutomationPeer.cs renamed to src/App/Controls/App/CardPanel/CardPanelAutomationPeer.cs

File renamed without changes.

src/App/Controls/CardPanel/CardPanelStateChangedEventArgs.cs renamed to src/App/Controls/App/CardPanel/CardPanelStateChangedEventArgs.cs

File renamed without changes.

‎src/App/Controls/App/CenterPopup/CenterPopup.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
HorizontalAlignment="Stretch"
5454
VerticalAlignment="{TemplateBinding PresenterVerticalAlignment}"
5555
Background="{ThemeResource CenterPopupPresenterBackground}"
56+
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
57+
BorderThickness="1"
5658
CornerRadius="{ThemeResource OverlayCornerRadius}"
5759
RowSpacing="12">
5860
<Grid.RowDefinitions>

‎src/App/Pages/Overlay/PlayerPage.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@
5353
</VisualState.Setters>
5454
</VisualState>
5555
</VisualStateGroup>
56+
57+
<VisualStateGroup x:Name="PlayerGroup">
58+
<VisualState x:Name="StandardPlayerState" />
59+
<VisualState x:Name="FullPlayerState">
60+
<VisualState.Setters>
61+
<Setter Target="BiliPlayer.CornerRadius" Value="0" />
62+
<Setter Target="PlayErrorContainer.CornerRadius" Value="0" />
63+
</VisualState.Setters>
64+
</VisualState>
65+
</VisualStateGroup>
5666
</VisualStateManager.VisualStateGroups>
5767
<Grid x:Name="ContentContainer" Padding="{StaticResource DefaultPagePadding}">
5868
<Grid

0 commit comments

Comments
 (0)