Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Browser/CefSharpBrowser/CefOp/CustomRequestHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ protected override bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser brow
{
return true;
}

return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
}

Expand Down
2 changes: 2 additions & 0 deletions Browser/CefSharpBrowser/CefSharpViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Forms.Integration;
Expand Down Expand Up @@ -133,6 +134,7 @@ protected override void InitializeAsync()
}

CefSharpSettings.SubprocessExitIfParentProcessClosed = true;
CefSharpSettings.RuntimeStyle = CefRuntimeStyle.Chrome;
Cef.Initialize(settings, false, (IBrowserProcessHandler?)null);

CustomRequestHandler requestHandler = new(Configuration);
Expand Down
8 changes: 7 additions & 1 deletion Browser/CefSharpBrowser/ExtraBrowser/ExtraBrowserWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button
Expand All @@ -64,9 +65,14 @@
Click="AkashiListButtonClick"
Content="{Binding FormBrowser.AkashiList, ElementName=ExtraBrowser}"
/>
<Button
Grid.Column="4"
Click="ExtensionButtonClick"
Content="{Binding FormBrowser.ExtensionManager, ElementName=ExtraBrowser}"
/>
<TextBox
x:Name="Address"
Grid.Column="4"
Grid.Column="5"
BorderBrush="Gray"
BorderThickness="1"
FontSize="12"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ private void AkashiListButtonClick(object sender, RoutedEventArgs e)
Browser.Load(Address.Text);
}

private void ExtensionButtonClick(object sender, RoutedEventArgs e)
{
Address.Text = "chrome://extensions";
Browser.Load(Address.Text);
}

private void ShowDevToolsMenuItemClick(object sender, RoutedEventArgs e)
{
Browser.ShowDevTools();
Expand Down
3 changes: 3 additions & 0 deletions Browser/FormBrowserTranslationViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public class FormBrowserTranslationViewModel
public string Forward => Resources.Forward;
public string DmmPoints => Resources.DmmPoints;
public string AkashiList => Resources.AkashiList;
public string ExtensionManager => Resources.ExtensionManager;
public string AddExtension => Resources.AddExtension;
public string RemoveExtension => Resources.RemoveExtension;

public string WebView2NotFound => Resources.WebView2NotFound;
public string WebView2DownloadComplete => Resources.WebView2DownloadComplete;
Expand Down
9 changes: 9 additions & 0 deletions Browser/Properties/Resources.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,13 @@ Would you like to refresh?</value>
<data name="FailedToApplyBrowserFont" xml:space="preserve">
<value>Failed to apply browser font.</value>
</data>
<data name="ExtensionManager" xml:space="preserve">
<value>Extension manager</value>
</data>
<data name="AddExtension" xml:space="preserve">
<value>Add extension</value>
</data>
<data name="RemoveExtension" xml:space="preserve">
<value>Remove extension</value>
</data>
</root>
Loading