Ability to maximize/resize browsers

Daybreak/Configuration/ApplicationConfiguration.cs

@@ -16,5 +16,7 @@ namespace Daybreak.Configuration
         public string ProtectedUsername { get; set; }
         [JsonProperty("ProtectedPassword")]
         public string ProtectedPassword { get; set; }
+        [JsonProperty("AddressBarReadonly")]
+        public bool AddressBarReadonly { get; set; } = true;
     }
 }

Daybreak/Controls/ChromiumBrowserWrapper.xaml

@@ -48,12 +48,18 @@
             </WrapPanel>
             <TextBox Text="{Binding ElementName=_this, Path=Address, Mode=OneWay}" FontSize="16" 
                      Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
-                     Grid.Column="1" IsReadOnly="True" Background="Transparent"
+                     Grid.Column="1" IsReadOnly="{Binding ElementName=_this, Path=AddressBarReadonly, Mode=OneWay}" Background="Transparent"
                      BorderThickness="1" VerticalAlignment="Center" VerticalContentAlignment="Center"
-                     BorderBrush="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"></TextBox>
-            <local:StarGlyph Grid.Column="2" Height="30" Width="30" Margin="5"
+                     BorderBrush="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                     PreviewKeyDown="TextBox_PreviewKeyDown"></TextBox>
+            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                <local:StarGlyph Height="30" Width="30" Margin="5"
                              Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
                              Clicked="StarGlyph_Clicked" x:Name="FavoriteButton"></local:StarGlyph>
+                <local:MaximizeButton Height="30" Width="30" Margin="5"
+                             Foreground="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                             Clicked="MaximizeButton_Clicked"></local:MaximizeButton>
+            </StackPanel>
         </Grid>
     </Grid>
 </UserControl>

Daybreak/Controls/ChromiumBrowserWrapper.xaml.cs

@@ -1,4 +1,5 @@
 using Daybreak.Launch;
+using Daybreak.Services.Configuration;
 using Microsoft.Web.WebView2.Core;
 using System;
 using System.Extensions;
@@ -16,32 +17,39 @@ namespace Daybreak.Controls
         public readonly static DependencyProperty AddressProperty = DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, string>(nameof(Address));
         public readonly static DependencyProperty FavoriteAddressProperty = DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, string>(nameof(FavoriteAddress));
         public readonly static DependencyProperty NavigatingProperty = DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, bool>(nameof(Navigating));
+        public readonly static DependencyProperty AddressBarReadonlyProperty = DependencyPropertyExtensions.Register<ChromiumBrowserWrapper, bool>(nameof(AddressBarReadonly));
 
         public event EventHandler<string> FavoriteUriChanged;
+        public event EventHandler MaximizeClicked;
 
         private readonly CoreWebView2Environment coreWebView2Environment;
+        private readonly IConfigurationManager configurationManager;
 
         public string Address
         {
             get => this.GetTypedValue<string>(AddressProperty);
             set => this.SetTypedValue(AddressProperty, value);
         }
-
         public string FavoriteAddress
         {
             get => this.GetTypedValue<string>(FavoriteAddressProperty);
             set => this.SetTypedValue(FavoriteAddressProperty, value);
         }
-
         public bool Navigating
         {
             get => this.GetTypedValue<bool>(NavigatingProperty);
             private set => this.SetTypedValue<bool>(NavigatingProperty, value);
         }
+        public bool AddressBarReadonly
+        {
+            get => this.GetTypedValue<bool>(AddressBarReadonlyProperty);
+            private set => this.SetTypedValue<bool>(AddressBarReadonlyProperty, value);
+        }
 
         public ChromiumBrowserWrapper()
         {
             this.coreWebView2Environment = Launcher.ApplicationServiceManager.GetService<CoreWebView2Environment>();
+            this.configurationManager = Launcher.ApplicationServiceManager.GetService<IConfigurationManager>();
             this.InitializeComponent();
             this.InitializeBrowser();
         }
@@ -55,14 +63,37 @@ namespace Daybreak.Controls
             }
         }
 
+        public void ReinitializeBrowser()
+        {
+            this.InitializeBrowser();
+        }
+
         private async void InitializeBrowser()
         {
             await this.WebBrowser.EnsureCoreWebView2Async(this.coreWebView2Environment);
+            this.AddressBarReadonly = this.configurationManager.GetConfiguration().AddressBarReadonly;
             this.WebBrowser.CoreWebView2.NewWindowRequested += (browser, args) => args.Handled = true;
             this.WebBrowser.NavigationStarting += (browser, args) => this.Navigating = true;
             this.WebBrowser.NavigationCompleted += (browser, args) => this.Navigating = false;
         }
 
+        private void TextBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.Enter)
+            {
+                var newAddress = sender.As<TextBox>().Text;
+                newAddress = SanitizeAddress(newAddress);
+                if (newAddress is null)
+                {
+                    return;
+                }
+
+                this.Address = newAddress;
+                this.WebBrowser.CoreWebView2.Navigate(this.Address);
+                e.Handled = true;
+            }
+        }
+
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)
         {
             this.WebBrowser.Dispose();
@@ -71,16 +102,19 @@ namespace Daybreak.Controls
         private void BackButton_Clicked(object sender, EventArgs e)
         {
             this.WebBrowser.GoBack();
+            this.Address = this.WebBrowser.Source.ToString();
         }
 
         private void ForwardButton_Clicked(object sender, EventArgs e)
         {
             this.WebBrowser.GoForward();
+            this.Address = this.WebBrowser.Source.ToString();
         }
 
         private void RefreshGlyph_Clicked(object sender, EventArgs e)
         {
             this.WebBrowser.Reload();
+            this.Address = this.WebBrowser.Source.ToString();
         }
 
         private void CancelGlyph_Clicked(object sender, EventArgs e)
@@ -94,6 +128,11 @@ namespace Daybreak.Controls
             this.FavoriteUriChanged?.Invoke(this, this.FavoriteAddress);
         }
 
+        private void MaximizeButton_Clicked(object sender, EventArgs e)
+        {
+            this.MaximizeClicked?.Invoke(this, e);
+        }
+
         private void CheckFavoriteAddress()
         {
             if (this.Address == this.FavoriteAddress)
@@ -105,5 +144,26 @@ namespace Daybreak.Controls
                 this.FavoriteButton.IsEnabled = true;
             }
         }
+
+        private static string SanitizeAddress(string address)
+        {
+            if (string.IsNullOrWhiteSpace(address))
+            {
+                return null;
+            }
+
+            if (address.StartsWith("www") is false &&
+                address.StartsWith("http") is false)
+            {
+                address = "https://www." + address;
+            }
+            else if (address.StartsWith("www"))
+            {
+                address = "https://" + address;
+            }
+
+            Uri.TryCreate(address, UriKind.Absolute, out var uri);
+            return uri?.ToString();
+        }
     }
 }

Daybreak/Controls/MaximizeButton.xaml

@@ -0,0 +1,39 @@
+<UserControl x:Class="Daybreak.Controls.MaximizeButton"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Daybreak.Controls"
+             x:Name="_this"
+             mc:Ignorable="d" 
+             d:DesignHeight="50" d:DesignWidth="50">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="0.3*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="0.3*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.3*" />
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="0.3*" />
+        </Grid.RowDefinitions>
+        <Ellipse x:Name="BackgroundEllipse" Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                 Opacity="0.6" Visibility="Hidden" Grid.RowSpan="3" Grid.ColumnSpan="3"></Ellipse>
+        <Viewbox Grid.Row="1" Grid.Column="1">
+            <Grid>
+                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m30,0l-24,0a5.9966,5.9966 0 0 0 -6,6l0,24a6,6 0 0 0 12,0l0,-18l18,0a6,6 0 0 0 0,-12z"></Path>
+                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m90,0l-24,0a6,6 0 0 0 0,12l18,0l0,18a6,6 0 0 0 12,0l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
+                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m30,84l-18,0l0,-18a6,6 0 0 0 -12,0l0,24a5.9966,5.9966 0 0 0 6,6l24,0a6,6 0 0 0 0,-12z"></Path>
+                <Path Fill="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}"
+                      Data="m90,60a5.9966,5.9966 0 0 0 -6,6l0,18l-18,0a6,6 0 0 0 0,12l24,0a5.9966,5.9966 0 0 0 6,-6l0,-24a5.9966,5.9966 0 0 0 -6,-6z"></Path>
+            </Grid>
+        </Viewbox>
+        <Ellipse Stroke="{Binding ElementName=_this, Path=Foreground, Mode=OneWay}" StrokeThickness="1" Fill="Transparent"
+                 MouseEnter="Ellipse_MouseEnter" MouseLeave="Ellipse_MouseLeave" MouseLeftButtonDown="Ellipse_MouseLeftButtonDown"
+                 Grid.RowSpan="3" Grid.ColumnSpan="3"></Ellipse>
+    </Grid>
+</UserControl>

Daybreak/Controls/MaximizeButton.xaml.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Daybreak.Controls
+{
+    /// <summary>
+    /// Interaction logic for SaveButton.xaml
+    /// </summary>
+    public partial class MaximizeButton : UserControl
+    {
+        public event EventHandler Clicked;
+
+        public MaximizeButton()
+        {
+            InitializeComponent();
+        }
+
+        private void Ellipse_MouseEnter(object sender, MouseEventArgs e)
+        {
+            BackgroundEllipse.Visibility = System.Windows.Visibility.Visible;
+        }
+
+        private void Ellipse_MouseLeave(object sender, MouseEventArgs e)
+        {
+            BackgroundEllipse.Visibility = System.Windows.Visibility.Hidden;
+        }
+
+        private void Ellipse_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                Clicked?.Invoke(this, e);
+            }
+        }
+    }
+}

Daybreak/Daybreak.csproj

@@ -9,7 +9,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
-    <Version>0.1.1</Version>
+    <Version>0.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,6 +37,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Page Update="Controls\MaximizeButton.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Controls\StarGlyph.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>

Daybreak/Launch/MainWindow.xaml.cs

@@ -134,7 +134,6 @@ namespace Daybreak.Launch
             {
                 var avgColor = GetAverageColor(bitmapImage);
                 var luminace = GetLuminace(avgColor);
-                Debug.WriteLine(luminace);
                 if (luminace < 0.15)
                 {
                     this.Foreground = Brushes.White;

Daybreak/Views/SettingsView.xaml

@@ -15,6 +15,7 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
+            <RowDefinition Height="auto"></RowDefinition>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="auto"></ColumnDefinition>
@@ -39,5 +40,8 @@
         <controls:FilePickerGlyph Grid.Row="4" Grid.Column="1" Height="30" Width="30" HorizontalAlignment="Right"
                                   Foreground="White" BorderBrush="Gray" BorderThickness="1"
                                   Clicked="FilePickerGlyph_Clicked"></controls:FilePickerGlyph>
+        <TextBlock Text="Address bar readonly: " FontSize="22" Foreground="White" Grid.Row="5"/>
+        <TextBox Grid.Column="1" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Row="5"
+                 x:Name="AddressBarReadonlyTextbox" FontSize="22" Background="Transparent" Foreground="White"></TextBox>
     </Grid>
 </UserControl>

Daybreak/Views/SettingsView.xaml.cs

@@ -39,7 +39,8 @@ namespace Daybreak.Views
                     this.UsernameTextbox.Text = credentials.Username;
                     this.PasswordBox.Password = credentials.Password;
 
-                }); 
+                });
+            this.AddressBarReadonlyTextbox.Text = config.AddressBarReadonly.ToString();
             this.CharacterTextbox.Text = config.CharacterName;
             this.GamePathTextbox.Text = config.GamePath;
         }
@@ -49,6 +50,11 @@ namespace Daybreak.Views
             var currentConfig = this.configurationManager.GetConfiguration();
             currentConfig.CharacterName = this.CharacterTextbox.Text;
             currentConfig.GamePath = this.GamePathTextbox.Text;
+            if (bool.TryParse(this.AddressBarReadonlyTextbox.Text, out var addressBarReadonly))
+            {
+                currentConfig.AddressBarReadonly = addressBarReadonly;
+            }
+
             this.configurationManager.SaveConfiguration(currentConfig);
             this.credentialManager.StoreCredentials(new LoginCredentials { Username = this.UsernameTextbox.Text, Password = this.PasswordBox.Password });
             this.viewManager.ShowView<StartupView>();

Daybreak/Views/StartupView.xaml

@@ -14,7 +14,7 @@
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibility"></BooleanToVisibilityConverter>
     </UserControl.Resources>
-    <Grid Background="Transparent">
+    <Grid Background="Transparent" x:Name="ViewContainer">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>
             <RowDefinition Height="auto"></RowDefinition>
@@ -28,13 +28,17 @@
                                Foreground="White" FontSize="36" Width="250" Height="60" VerticalAlignment="Bottom" Margin="0, 0, 0, 30"
                                IsEnabled="{Binding ElementName=_this, Path=LaunchButtonEnabled, Mode=OneWay}"
                                Clicked="OpaqueButton_Clicked" Grid.Row="1" Grid.ColumnSpan="3"></controls:OpaqueButton>
-        <controls:ChromiumBrowserWrapper Grid.Column="2" Margin="10" Address="{Binding ElementName=_this, Path=RightBrowserAddress, Mode=OneWay}"
-                                         Foreground="White" FavoriteUriChanged="RightBrowser_FavoriteUriChanged"
-                                         FavoriteAddress="{Binding ElementName=_this, Path=RightBrowserFavoriteAddress, Mode=OneWay}"/>
-
-        <controls:ChromiumBrowserWrapper Grid.Column="0" Margin="10" Address="{Binding ElementName=_this, Path=LeftBrowserAddress, Mode=OneWay}"
-                                         Foreground="White" FavoriteUriChanged="LeftBrowser_FavoriteUriChanged"
-                                         FavoriteAddress="{Binding ElementName=_this, Path=LeftBrowserFavoriteAddress, Mode=OneWay}"/>
-
+        <Grid x:Name="RightContainer" Grid.Column="2" Margin="10">
+            <controls:ChromiumBrowserWrapper Address="{Binding ElementName=_this, Path=RightBrowserAddress, Mode=OneWay}"
+                                             Foreground="White" FavoriteUriChanged="RightBrowser_FavoriteUriChanged"
+                                             FavoriteAddress="{Binding ElementName=_this, Path=RightBrowserFavoriteAddress, Mode=OneWay}"
+                                             MaximizeClicked="RightChromiumBrowserWrapper_MaximizeClicked"/>
+        </Grid>
+        <Grid x:Name="LeftContainer" Grid.Column="0" Margin="10">
+            <controls:ChromiumBrowserWrapper Address="{Binding ElementName=_this, Path=LeftBrowserAddress, Mode=OneWay}"
+                                             Foreground="White" FavoriteUriChanged="LeftBrowser_FavoriteUriChanged"
+                                             FavoriteAddress="{Binding ElementName=_this, Path=LeftBrowserFavoriteAddress, Mode=OneWay}"
+                                             MaximizeClicked="LeftChromiumBrowserWrapper_MaximizeClicked"/>
+        </Grid>
     </Grid>
 </UserControl>

Daybreak/Views/StartupView.xaml.cs

@@ -1,4 +1,5 @@
-using Daybreak.Services.ApplicationDetection;
+using Daybreak.Controls;
+using Daybreak.Services.ApplicationDetection;
 using Daybreak.Services.Configuration;
 using Daybreak.Services.ViewManagement;
 using System;
@@ -31,6 +32,9 @@ namespace Daybreak.Views
         private readonly IConfigurationManager configurationManager;
         private readonly CancellationTokenSource cancellationTokenSource = new();
 
+        private bool leftBrowserMaximized = false;
+        private bool rightBrowserMaximized = false;
+
         public string RightBrowserFavoriteAddress
         {
             get => this.GetTypedValue<string>(RightBrowserFavoriteAddressProperty);
@@ -130,5 +134,41 @@ namespace Daybreak.Views
             config.RightBrowserDefault = e;
             this.configurationManager.SaveConfiguration(config);
         }
+
+        private void LeftChromiumBrowserWrapper_MaximizeClicked(object sender, EventArgs e)
+        {
+            if (this.leftBrowserMaximized)
+            {
+                this.ViewContainer.ColumnDefinitions[0].Width = new GridLength(1, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[1].Width = new GridLength(1, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[2].Width = new GridLength(1, GridUnitType.Star);
+            }
+            else
+            {
+                this.ViewContainer.ColumnDefinitions[0].Width = new GridLength(1, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[1].Width = new GridLength(0, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[2].Width = new GridLength(0, GridUnitType.Star);
+            }
+
+            this.leftBrowserMaximized = !this.leftBrowserMaximized;
+        }
+
+        private void RightChromiumBrowserWrapper_MaximizeClicked(object sender, EventArgs e)
+        {
+            if (this.rightBrowserMaximized)
+            {
+                this.ViewContainer.ColumnDefinitions[0].Width = new GridLength(1, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[1].Width = new GridLength(1, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[2].Width = new GridLength(1, GridUnitType.Star);
+            }
+            else
+            {
+                this.ViewContainer.ColumnDefinitions[0].Width = new GridLength(0, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[1].Width = new GridLength(0, GridUnitType.Star);
+                this.ViewContainer.ColumnDefinitions[2].Width = new GridLength(1, GridUnitType.Star);
+            }
+
+            this.rightBrowserMaximized = !this.rightBrowserMaximized;
+        }
     }
 }

README.md

@@ -7,7 +7,7 @@ Requires standalone version https://developer.microsoft.com/microsoft-edge/webvi
 ## Features
 Automatically detect if guildwars is running or not. Includes the ability to launch guildwars from the client.
 
-Manages username and password combination. Stores them in Windows Credential Manager.
+Manages username and password combination.
 
 Ability to set a character name which gets autoloaded during launch.