Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Download Events (#379) and add GetText/GetSource support! #380

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix Download Events (#379) and add GetText/GetSource support! #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f7cedc
Bump CefGlue (fixes context menu) and version, Fix disposed error in …
dhhunter Feb 12, 2025
587a18f
Bump major version to reflect new features!
dhhunter Feb 12, 2025
4cc79b9
Revert "Bump major version to reflect new features!"
dhhunter Feb 12, 2025
3aa1bb2
Bump major version to reflect new features!
dhhunter Feb 12, 2025
0a5c40a
Bump CefGlue (fixes context menu) and major version!
dhhunter Feb 12, 2025
32ef7d0
Merge branch 'master' of https://github.com/dhhunter/WebView
dhhunter Feb 12, 2025
635f24c
Set DownloadItem.FullPath = "" when null!
dhhunter Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<TargetDotnetVersion>net8.0</TargetDotnetVersion>
<Platforms>x64;ARM64</Platforms>
<AvaloniaVersion>11.0.10</AvaloniaVersion>
<CefGlueVersion>120.6099.207</CefGlueVersion>
<CefGlueVersion>120.6099.210</CefGlueVersion>
</PropertyGroup>

<PropertyGroup>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<Version>3.120.8</Version>
<Version>4.120.0</Version>
<Authors>OutSystems</Authors>
<Product>WebViewControl</Product>
<Copyright>Copyright © OutSystems 2023</Copyright>
Expand Down
60 changes: 27 additions & 33 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemDefinitionGroup>
<!--
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemDefinitionGroup>
<!--
Disable transitive package references
https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#controlling-dependency-assets
https://github.com/dotnet/sdk/issues/11803
-->
<PackageReference>
<PrivateAssets>$(PrivateAssets);compile</PrivateAssets>
</PackageReference>
</ItemDefinitionGroup>

<ItemGroup>
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />

<PackageVersion Include="CefGlue.Avalonia" Version="$(CefGlueVersion)" />
<PackageVersion Include="CefGlue.WPF" Version="$(CefGlueVersion)" />

<PackageVersion Include="CefGlue.Avalonia.ARM64" Version="$(CefGlueVersion)" />
<PackageVersion Include="CefGlue.WPF.ARM64" Version="$(CefGlueVersion)" />

<PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
<PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />

<PackageVersion Include="nunit" Version="3.13.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
</ItemGroup>
</Project>
<PackageReference>
<PrivateAssets>$(PrivateAssets);compile</PrivateAssets>
</PackageReference>
</ItemDefinitionGroup>
<ItemGroup>
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageVersion Include="CefGlue.Avalonia" Version="$(CefGlueVersion)" />
<PackageVersion Include="CefGlue.WPF" Version="$(CefGlueVersion)" />
<PackageVersion Include="CefGlue.Avalonia.ARM64" Version="$(CefGlueVersion)" />
<PackageVersion Include="CefGlue.WPF.ARM64" Version="$(CefGlueVersion)" />
<PackageVersion Include="Microsoft.CSharp" Version="4.5.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
<PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
<PackageVersion Include="nunit" Version="3.13.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
</ItemGroup>
</Project>
95 changes: 59 additions & 36 deletions SampleWebView.Avalonia/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,6 @@
ExtendClientAreaChromeHints="PreferSystemChrome"
TransparencyLevelHint="AcrylicBlur"
Background="Transparent">

<NativeMenu.Menu>
<NativeMenu>
<NativeMenuItem Header="Edit">
<NativeMenuItem.Menu>
<NativeMenu>
<NativeMenuItem Header="Undo" Command="{Binding UndoCommand}" Gesture="CMD+Z" />
<NativeMenuItem Header="Redo" Command="{Binding RedoCommand}" Gesture="Shift+CMD+Z" />
<NativeMenuItemSeparator/>
<NativeMenuItem Header="Cut" Command="{Binding CutCommand}" Gesture="CMD+X" />
<NativeMenuItem Header="Copy" Command="{Binding CopyCommand}" Gesture="CMD+C" />
<NativeMenuItem Header="Paste" Command="{Binding PasteCommand}" Gesture="CMD+V" />
<NativeMenuItem Header="Delete" Command="{Binding DeleteCommand}" Gesture="CMD+Back" />
<NativeMenuItemSeparator/>
<NativeMenuItem Header="Select All" Command="{Binding SelectAllCommand}" Gesture="CMD+A" />
</NativeMenu>
</NativeMenuItem.Menu>
</NativeMenuItem>
<NativeMenuItem Header="Navigate">
<NativeMenuItem.Menu>
<NativeMenu>
<NativeMenuItem Header="Back" Command="{Binding BackCommand}" />
<NativeMenuItem Header="Forward" Command="{Binding ForwardCommand}" />
</NativeMenu>
</NativeMenuItem.Menu>
</NativeMenuItem>
</NativeMenu>
</NativeMenu.Menu>

<Panel>
<ExperimentalAcrylicBorder IsHitTestVisible="False">
<ExperimentalAcrylicBorder.Material>
Expand All @@ -47,14 +18,66 @@
</ExperimentalAcrylicBorder.Material>
</ExperimentalAcrylicBorder>
<DockPanel>
<DockPanel DockPanel.Dock="Top" Margin="5 15 5 5">
<Menu DockPanel.Dock="Top">
<MenuItem Header="_File">
<MenuItem Header="Open _DevTools" Command="{Binding ShowDevToolsCommand}"/>
<Separator/>
<MenuItem Header="Save _HTML" Command="{Binding GetSourceCommand}" IsEnabled="{Binding !SourceAvailable }"/>
<MenuItem Header="Save _Text" Command="{Binding GetTextCommand}" IsEnabled="{Binding !TextAvailable}"/>
<Separator/>
<MenuItem Header="E_xit" Command="{Binding ExitCommand}" InputGesture="Alt+F4"/>
</MenuItem>
<MenuItem Header="_Edit">
<MenuItem Header="_Undo" Command="{Binding UndoCommand}" InputGesture="CMD+Z" />
<MenuItem Header="_Redo" Command="{Binding RedoCommand}" InputGesture="Shift+CMD+Z" />
<Separator />
<MenuItem Header="C_ut" Command="{Binding CutCommand}" InputGesture="CMD+X" />
<MenuItem Header="C_opy" Command="{Binding CopyCommand}" InputGesture="CMD+C" />
<MenuItem Header="_Paste" Command="{Binding PasteCommand}" InputGesture="CMD+V" />
<MenuItem Header="_Delete" Command="{Binding DeleteCommand}" InputGesture="CMD+Back" />
<Separator />
<MenuItem Header="Select _All" Command="{Binding SelectAllCommand}" InputGesture="CMD+A" />
</MenuItem>
<MenuItem Header="_Navigate">
<MenuItem Header="_Back" Command="{Binding BackCommand}"/>
<MenuItem Header="_Forward" Command="{Binding ForwardCommand}"/>
</MenuItem>
</Menu>

<TextBox Background="Transparent" TabIndex="0" Text="{Binding Address}" Margin="5 0 5 0">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding NavigateCommand}" />
</TextBox.KeyBindings>
</TextBox>
</DockPanel>

<DockPanel DockPanel.Dock="Top" Margin="0 0 400 0">
<Button DockPanel.Dock="Right" Background="Transparent" Command="{Binding ShowDevToolsCommand}">Show DevTools</Button>
<TextBox Background="Transparent" TabIndex="0" Text="{Binding Address}" Margin="80 0 0 0">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding NavigateCommand}" />
</TextBox.KeyBindings>
</TextBox>
<DockPanel Dock="Bottom"
VerticalAlignment="Center"
Background="LightGray"
IsVisible="{Binding IsDownloading}">
<Grid DockPanel.Dock="Right"
Margin="10, 10, 10, 10"
RowDefinitions="Auto, Auto, Auto"
ColumnDefinitions="Auto">
<Label Grid.Row="0" Grid.Column="0"
Content="{Binding DownloadMessage}"/>
<Label Grid.Row="1" Grid.Column="0"
Content="{Binding DownloadProgress}"/>
<ProgressBar Grid.Row="2" Grid.Column="0"
VerticalAlignment="Center"
Background="Transparent"
Height="26"
Foreground="Aqua"
IsIndeterminate="{Binding !IsDownloadDeterminate}"
Value="{Binding DownloadPercentage}" />
<TextBlock Grid.Row="2" Grid.Column="0"
Background="Transparent"
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsVisible="{Binding IsDownloadDeterminate}"
Text="{Binding DownloadPercentage, StringFormat={}{0:0}%, Mode=OneWay}" />
</Grid>
</DockPanel>

<webview:WebView x:Name="webview" Focusable="True" Address="{Binding CurrentAddress}" />
Expand Down
122 changes: 122 additions & 0 deletions SampleWebView.Avalonia/MainWindowV1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:webview="clr-namespace:WebViewControl;assembly=WebViewControl.Avalonia"
x:Class="SampleWebView.Avalonia.MainWindowV1"
Title="Sample WebView"
ExtendClientAreaToDecorationsHint="True"
ExtendClientAreaChromeHints="PreferSystemChrome"
TransparencyLevelHint="AcrylicBlur"
Background="Transparent">

<NativeMenu.Menu>
<NativeMenu>
<NativeMenuItem Header="Edit">
<NativeMenuItem.Menu>
<NativeMenu>
<NativeMenuItem Header="Undo" Command="{Binding UndoCommand}" Gesture="CMD+Z" />
<NativeMenuItem Header="Redo" Command="{Binding RedoCommand}" Gesture="Shift+CMD+Z" />
<NativeMenuItemSeparator />
<NativeMenuItem Header="Cut" Command="{Binding CutCommand}" Gesture="CMD+X" />
<NativeMenuItem Header="Copy" Command="{Binding CopyCommand}" Gesture="CMD+C" />
<NativeMenuItem Header="Paste" Command="{Binding PasteCommand}" Gesture="CMD+V" />
<NativeMenuItem Header="Delete" Command="{Binding DeleteCommand}" Gesture="CMD+Back" />
<NativeMenuItemSeparator />
<NativeMenuItem Header="Select All" Command="{Binding SelectAllCommand}" Gesture="CMD+A" />
</NativeMenu>
</NativeMenuItem.Menu>
</NativeMenuItem>
<NativeMenuItem Header="Navigate">
<NativeMenuItem.Menu>
<NativeMenu>
<NativeMenuItem Header="Back" Command="{Binding BackCommand}" />
<NativeMenuItem Header="Forward" Command="{Binding ForwardCommand}" />
</NativeMenu>
</NativeMenuItem.Menu>
</NativeMenuItem>
</NativeMenu>
</NativeMenu.Menu>

<Panel>
<ExperimentalAcrylicBorder IsHitTestVisible="False">
<ExperimentalAcrylicBorder.Material>
<ExperimentalAcrylicMaterial BackgroundSource="Digger"
TintColor="{DynamicResource SystemAltHighColor}"
TintOpacity="1"
FallbackColor="Black"
MaterialOpacity="0.25" />
</ExperimentalAcrylicBorder.Material>
</ExperimentalAcrylicBorder>
<DockPanel>

<DockPanel DockPanel.Dock="Top" Margin="0 0 400 0">
<Button DockPanel.Dock="Right"
Background="Transparent"
Command="{Binding ShowDevToolsCommand}">
Show DevTools
</Button>

<CheckBox DockPanel.Dock="Right"
Background="Transparent"
IsEnabled="False"
IsChecked="{Binding TextAvailable}">
Text
</CheckBox>
<Button DockPanel.Dock="Right"
Background="Transparent"
IsEnabled="{Binding !TextAvailable}"
Command="{Binding GetTextCommand}">
Get Text
</Button>

<CheckBox DockPanel.Dock="Right"
Background="Transparent"
IsEnabled="False"
IsChecked="{Binding SourceAvailable}">
Source
</CheckBox>
<Button DockPanel.Dock="Right"
Background="Transparent"
IsEnabled="{Binding !SourceAvailable}"
Command="{Binding GetSourceCommand}">
Get Source
</Button>

<TextBox Background="Transparent" TabIndex="0" Text="{Binding Address}" Margin="80 0 0 0">
<TextBox.KeyBindings>
<KeyBinding Gesture="Enter" Command="{Binding NavigateCommand}" />
</TextBox.KeyBindings>
</TextBox>
</DockPanel>

<DockPanel Dock="Bottom"
VerticalAlignment="Center"
Background="LightGray"
IsVisible="{Binding IsDownloading}">
<Grid DockPanel.Dock="Right"
Margin="10, 10, 10, 10"
RowDefinitions="Auto, Auto, Auto"
ColumnDefinitions="Auto">
<Label Grid.Row="0" Grid.Column="0"
Content="{Binding DownloadMessage}"/>
<Label Grid.Row="1" Grid.Column="0"
Content="{Binding DownloadProgress}"/>
<ProgressBar Grid.Row="2" Grid.Column="0"
VerticalAlignment="Center"
Background="Transparent"
Height="26"
Foreground="Aqua"
IsIndeterminate="{Binding !IsDownloadDeterminate}"
Value="{Binding DownloadPercentage}" />
<TextBlock Grid.Row="2" Grid.Column="0"
Background="Transparent"
HorizontalAlignment="Center"
VerticalAlignment="Center"
IsVisible="{Binding IsDownloadDeterminate}"
Text="{Binding DownloadPercentage, StringFormat={}{0:0}%, Mode=OneWay}" />
</Grid>
</DockPanel>

<webview:WebView x:Name="webview" Focusable="True" Address="{Binding CurrentAddress}" />
</DockPanel>
</Panel>
</Window>
16 changes: 16 additions & 0 deletions SampleWebView.Avalonia/MainWindowV1.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using WebViewControl;

namespace SampleWebView.Avalonia {

internal partial class MainWindowV1 : Window {

public MainWindowV1() {
WebView.Settings.LogFile = "ceflog.txt";
AvaloniaXamlLoader.Load(this);

DataContext = new MainWindowV1ViewModel(this.FindControl<WebView>("webview"));
}
}
}
Loading
Loading