dimedtec/HomeStream
1
0
Fork 0
Code Issues Pull requests Projects Releases 3 Packages Wiki Activity Actions

EPG-Overlay zurueck in VideoView (HWND-Fix), WebView wird beim EPG-Oeffnen versteckt

Browse source
This commit is contained in:
administrator 2026-05-13 00:09:21 +02:00
parent d22808497d
commit d0f9df0a64
2 changed files with 98 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

65
MainWindow.xaml
View file

@ -236,7 +236,7 @@
Background="#01000000"
PreviewMouseLeftButtonDown="VideoClickCatcher_DoubleClick">
<Grid>
<!-- Radio-Cover bei Audio-Streams — INNERHALB VideoView damit es die native HWND überdeckt -->
<!-- Radio-Cover bei Audio-Streams -->
<Border x:Name="RadioCover" Visibility="Collapsed" Background="#1A1A1A">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<Image x:Name="RadioLogo" Width="200" Height="200" Stretch="Uniform"
@ -253,18 +253,12 @@
TextWrapping="Wrap" TextAlignment="Center" MaxWidth="600"/>
</StackPanel>
</Border>
</Grid>
</Border>
</vlc:VideoView>
<!-- WebView2 fuer Web-Sender -->
<wv2:WebView2 x:Name="WebView" Visibility="Collapsed" Panel.ZIndex="5"/>
<!-- EPG-Overlay: AUSSERHALB VideoView und WebView damit es immer sichtbar ist -->
<!-- Panel.ZIndex="10" stellt sicher dass es ueber VLC-HWND und WebView-HWND liegt -->
<!-- EPG-Overlay: INNERHALB VideoView (HWND-Grenze)
VideoView wird beim EPG-Oeffnen immer sichtbar gemacht,
auch wenn WebView aktiv war -->
<Border x:Name="EpgOverlay" Visibility="Collapsed"
Background="#D8000000"
Panel.ZIndex="10">
Background="#D8000000">
<DockPanel>
<Grid DockPanel.Dock="Top" Background="#0A0A0A" Height="60">
<Grid.ColumnDefinitions>
@ -290,10 +284,59 @@
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto"
Background="#0A0A0A">
<ScrollViewer.Resources>
<Style TargetType="ScrollBar">
<Setter Property="Background" Value="#0E0E0E"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Width" Value="10"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ScrollBar">
<Grid Background="{TemplateBinding Background}">
<Track Name="PART_Track" IsDirectionReversed="true">
<Track.Thumb>
<Thumb>
<Thumb.Template>
<ControlTemplate TargetType="Thumb">
<Border x:Name="thumbBd" Background="#3A3A3A" CornerRadius="3" Margin="2"/>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="thumbBd" Property="Background" Value="#555"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Thumb.Template>
</Thumb>
</Track.Thumb>
<Track.IncreaseRepeatButton>
<RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageDownCommand" IsTabStop="False"/>
</Track.IncreaseRepeatButton>
<Track.DecreaseRepeatButton>
<RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageUpCommand" IsTabStop="False"/>
</Track.DecreaseRepeatButton>
</Track>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="Orientation" Value="Horizontal">
<Setter Property="Width" Value="Auto"/>
<Setter Property="Height" Value="10"/>
</Trigger>
</Style.Triggers>
</Style>
</ScrollViewer.Resources>
<Canvas x:Name="EpgCanvas"/>
</ScrollViewer>
</DockPanel>
</Border>
</Grid>
</Border>
</vlc:VideoView>
<!-- WebView2 fuer Web-Sender -->
<wv2:WebView2 x:Name="WebView" Visibility="Collapsed" Panel.ZIndex="5"/>
<TextBlock x:Name="TxtNoChannel"
Text="Wähle einen Sender aus der Liste"

20
MainWindow.xaml.cs
View file

@ -761,16 +761,26 @@ public partial class MainWindow : Window
private async void BtnEpgGrid_Click(object sender, RoutedEventArgs e)
{
// WebView pausieren (EPG-Overlay liegt jetzt ausserhalb der HWNDs, kein Visibility-Wechsel noetig)
// EPG-Overlay liegt innerhalb VideoView (HWND) - VideoView muss sichtbar sein
if (_currentChannel?.Kind == ChannelKind.Web && _webViewReady)
await WebView.CoreWebView2.ExecuteScriptAsync(
"document.querySelectorAll('video,audio').forEach(m => m.pause())");
WebView.Visibility = Visibility.Collapsed;
VideoView.Visibility = Visibility.Visible;
VideoOverlay.Visibility = Visibility.Visible;
await ShowEpgOverlayAsync();
}
private void BtnCloseEpg_Click(object sender, RoutedEventArgs e)
{
HideEpgOverlay();
// Wenn Web-Sender: WebView wieder zeigen
if (_currentChannel?.Kind == ChannelKind.Web)
{
VideoView.Visibility = Visibility.Collapsed;
VideoOverlay.Visibility = Visibility.Collapsed;
WebView.Visibility = Visibility.Visible;
}
}
// ────────── EPG-Overlay (Joyn-Style) ──────────
@ -1113,7 +1123,15 @@ public partial class MainWindow : Window
case Key.F11: ToggleFullscreen(); e.Handled = true; break;
case Key.Escape:
if (EpgOverlay.Visibility == Visibility.Visible)
{
HideEpgOverlay();
if (_currentChannel?.Kind == ChannelKind.Web)
{
VideoView.Visibility = Visibility.Collapsed;
VideoOverlay.Visibility = Visibility.Collapsed;
WebView.Visibility = Visibility.Visible;
}
}
else if (_isFullscreen) ToggleFullscreen();
e.Handled = true;
break;