AlastorFox/FoxBrowser
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

BASE 1.2.2

Browse Source
This commit is contained in:
AlastorFox committed 2026-10-11 23:56:50 +03:00
1 parent 63be149caf
commit 3abaa4665d
2 files changed
+152 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+75 -10
View File
@@ -8,6 +8,7 @@
TextOptions.TextFormattingMode="Display"
RenderOptions.ClearTypeHint="Enabled">
<Window.Resources>
<QuadraticEase x:Key="TabEase" EasingMode="EaseOut" />
<DataTemplate x:Key="TabTemplate">
<Grid MinWidth="126" MaxWidth="250" Height="34">
<Grid.ColumnDefinitions>
@@ -35,7 +36,33 @@
FontWeight="Bold"
Background="Transparent"
BorderBrush="Transparent"
Foreground="{StaticResource TextMuted}">
Foreground="{StaticResource TextMuted}"
Opacity="0">
<Button.Style>
<Style TargetType="Button">
<Setter Property="Opacity" Value="0" />
<Setter Property="IsHitTestVisible" Value="False" />
<Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=TabItem}, Path=IsMouseOver}" Value="True">
<Setter Property="IsHitTestVisible" Value="True" />
<DataTrigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<DoubleAnimation Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.12" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</DataTrigger.EnterActions>
<DataTrigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<DoubleAnimation Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:0.12" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</DataTrigger.ExitActions>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
<Button.Template>
<ControlTemplate TargetType="Button">
<Border x:Name="CloseBorder" Background="{TemplateBinding Background}" CornerRadius="5">
@@ -64,23 +91,61 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
<Border x:Name="TabBorder"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
<Border x:Name="TabBorder"
Background="#191F28"
BorderBrush="#2B3441"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="8"
CornerRadius="8,8,0,0"
Padding="{TemplateBinding Padding}"
Margin="0,0,6,2">
Margin="0,0,6,2"
RenderTransformOrigin="0.5,0.5">
<Border.RenderTransform>
<ScaleTransform ScaleX="1" ScaleY="1" />
</Border.RenderTransform>
<ContentPresenter ContentSource="Header" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="TabBorder" Property="Background" Value="#222A35" />
<Setter TargetName="TabBorder" Property="BorderBrush" Value="{StaticResource BorderMedium}" />
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="#222A35" Duration="0:0:0.13" EasingFunction="{StaticResource TabEase}" />
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="#46566C" Duration="0:0:0.13" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="#191F28" Duration="0:0:0.13" EasingFunction="{StaticResource TabEase}" />
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="#2B3441" Duration="0:0:0.13" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
</Trigger>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="TabBorder" Property="Background" Value="#26354B" />
<Setter TargetName="TabBorder" Property="BorderBrush" Value="{StaticResource AurBlue}" />
<Setter TargetName="TabBorder" Property="Effect">
<Setter.Value>
<DropShadowEffect BlurRadius="7" ShadowDepth="1" Opacity="0.28" Color="#000000" />
</Setter.Value>
</Setter>
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="#26354B" Duration="0:0:0.14" EasingFunction="{StaticResource TabEase}" />
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="#78AFFF" Duration="0:0:0.14" EasingFunction="{StaticResource TabEase}" />
<DoubleAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(UIElement.Opacity)" To="1" Duration="0:0:0.14" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="#191F28" Duration="0:0:0.14" EasingFunction="{StaticResource TabEase}" />
<ColorAnimation Storyboard.TargetName="TabBorder" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="#2B3441" Duration="0:0:0.14" EasingFunction="{StaticResource TabEase}" />
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
MainWindow.xaml.cs
+77 -4
View File
@@ -6,6 +6,7 @@ using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media.Animation;
using System.Windows.Threading;
using Microsoft.Web.WebView2.Core;
using FoxBrowser.Core;
@@ -16,6 +17,8 @@ using WpfDragEventArgs = System.Windows.DragEventArgs;
using WpfKeyEventArgs = System.Windows.Input.KeyEventArgs;
using WpfMouseEventArgs = System.Windows.Input.MouseEventArgs;
using WpfPoint = System.Windows.Point;
using WpfScaleTransform = System.Windows.Media.ScaleTransform;
using WpfTranslateTransform = System.Windows.Media.TranslateTransform;
namespace FoxBrowser;
@@ -31,6 +34,8 @@ public partial class MainWindow : Window
private AppSettings _appSettings;
private WpfPoint _tabDragStartPoint;
private BrowserTab? _tabDragItem;
private TabItem? _draggedTabContainer;
private TabItem? _dragPreviewTarget;
private bool _topPanelVisible = true;
private const int WmNcRButtonDown = 0x00A4;
@@ -307,11 +312,12 @@ public partial class MainWindow : Window
if (_tabManager?.ActiveTab is null) return;
await _tabManager.NavigateAsync(_tabManager.ActiveTab, AddressBox.Text);
AddressBox.Text = _tabManager.ActiveTab.Address;
AnimateWebViewTransition();
}
private void Back_Click(object sender, RoutedEventArgs e) => _tabManager?.GoBack();
private void Forward_Click(object sender, RoutedEventArgs e) => _tabManager?.GoForward();
private void Reload_Click(object sender, RoutedEventArgs e) => _tabManager?.Reload();
private void Back_Click(object sender, RoutedEventArgs e) { AnimateWebViewTransition(); _tabManager?.GoBack(); }
private void Forward_Click(object sender, RoutedEventArgs e) { AnimateWebViewTransition(); _tabManager?.GoForward(); }
private void Reload_Click(object sender, RoutedEventArgs e) { AnimateWebViewTransition(); _tabManager?.Reload(); }
private void Extensions_Click(object sender, RoutedEventArgs e)
{
if (_tabManager?.ExtensionManager is null) return;
@@ -367,12 +373,45 @@ public partial class MainWindow : Window
Math.Abs(position.Y - _tabDragStartPoint.Y) < SystemParameters.MinimumVerticalDragDistance) return;
var item = _tabDragItem;
_tabDragItem = null;
System.Windows.DragDrop.DoDragDrop(TabStrip, item, WpfDragDropEffects.Move);
_draggedTabContainer = FindTabItem(e.OriginalSource as DependencyObject);
if (_draggedTabContainer is not null)
{
_draggedTabContainer.Opacity = 0.7;
_draggedTabContainer.RenderTransformOrigin = new System.Windows.Point(0.5, 0.5);
_draggedTabContainer.RenderTransform = new System.Windows.Media.ScaleTransform(0.97, 0.97);
}
try
{
System.Windows.DragDrop.DoDragDrop(TabStrip, item, WpfDragDropEffects.Move);
}
finally
{
RestoreDraggedTabVisual();
ResetDragPreview();
}
}
private void TabStrip_DragOver(object sender, WpfDragEventArgs e)
{
e.Effects = e.Data.GetDataPresent(typeof(BrowserTab)) ? WpfDragDropEffects.Move : WpfDragDropEffects.None;
if (e.Data.GetDataPresent(typeof(BrowserTab)))
{
var target = FindTabItem(e.OriginalSource as DependencyObject);
if (target is not null && !ReferenceEquals(target, _draggedTabContainer) && !ReferenceEquals(target, _dragPreviewTarget))
{
ResetDragPreview();
_dragPreviewTarget = target;
var source = e.Data.GetData(typeof(BrowserTab)) as BrowserTab;
var targetTab = target.DataContext as BrowserTab;
var sourceIndex = source is null ? -1 : _tabManager?.Tabs.IndexOf(source) ?? -1;
var targetIndex = targetTab is null ? -1 : _tabManager?.Tabs.IndexOf(targetTab) ?? -1;
var offset = sourceIndex >= 0 && targetIndex >= 0 && sourceIndex < targetIndex ? -6 : 6;
var translation = new System.Windows.Media.TranslateTransform();
target.RenderTransform = translation;
translation.BeginAnimation(System.Windows.Media.TranslateTransform.XProperty,
new DoubleAnimation(offset, new Duration(TimeSpan.FromMilliseconds(120))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
}
}
e.Handled = true;
}
@@ -387,6 +426,39 @@ public partial class MainWindow : Window
e.Handled = true;
}
private void RestoreDraggedTabVisual()
{
if (_draggedTabContainer is null) return;
_draggedTabContainer.BeginAnimation(UIElement.OpacityProperty,
new DoubleAnimation(0.7, 1, new Duration(TimeSpan.FromMilliseconds(140))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
if (_draggedTabContainer.RenderTransform is WpfScaleTransform scale)
{
scale.BeginAnimation(WpfScaleTransform.ScaleXProperty,
new DoubleAnimation(0.97, 1, new Duration(TimeSpan.FromMilliseconds(140))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
scale.BeginAnimation(WpfScaleTransform.ScaleYProperty,
new DoubleAnimation(0.97, 1, new Duration(TimeSpan.FromMilliseconds(140))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
}
_draggedTabContainer = null;
}
private void ResetDragPreview()
{
if (_dragPreviewTarget?.RenderTransform is WpfTranslateTransform translation)
{
translation.BeginAnimation(WpfTranslateTransform.XProperty,
new DoubleAnimation(translation.X, 0, new Duration(TimeSpan.FromMilliseconds(120))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
}
_dragPreviewTarget = null;
}
private void AnimateWebViewTransition()
{
WebViewHost.BeginAnimation(UIElement.OpacityProperty, null);
WebViewHost.Opacity = 0.85;
WebViewHost.BeginAnimation(UIElement.OpacityProperty,
new DoubleAnimation(0.85, 1, new Duration(TimeSpan.FromMilliseconds(130))) { EasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut } });
}
private static TabItem? FindTabItem(DependencyObject? element)
{
while (element is not null)
@@ -437,6 +509,7 @@ public partial class MainWindow : Window
if (e.Source != TabStrip || TabStrip.SelectedItem is not BrowserTab tab || _tabManager is null || !_tabManager.SessionReady) return;
AddressBox.Text = tab.Address;
await _tabManager.SwitchToTabAsync(tab);
AnimateWebViewTransition();
RefreshAddressBar();
RefreshModeIndicators();
}