Skip to content

Feature: Redesign Status Window #3359

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

Merged
mergify merged 6 commits into from
Mar 8, 2026
Merged

Feature: Redesign Status Window #3359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b0fea3
Feature: Redesign Status Window
BornToBeRoot Mar 8, 2026
46205bb
Merge branch 'main' into feature/re-design-status-window
BornToBeRoot Mar 8, 2026
ea9b8cb
Docs: #3359
BornToBeRoot Mar 8, 2026
9ab289d
Update Source/NETworkManager/StatusWindow.xaml.cs
BornToBeRoot Mar 8, 2026
658aa29
Chore: Adjust tooltip
BornToBeRoot Mar 8, 2026
ff39fed
Merge branch 'feature/re-design-status-window' of https://github.com/…
BornToBeRoot Mar 8, 2026
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
37 changes: 37 additions & 0 deletions Source/NETworkManager.Converters/TimeToStrokeDashOffsetConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using System;
using System.Globalization;
using System.Windows.Data;

namespace NETworkManager.Converters;

/// <summary>
/// Converts <c>Time</c> (values[0]) and <c>TimeMax</c> (values[1]) into a <see cref="double" />
/// stroke dash offset for a circular countdown ring. <c>ConverterParameter</c> must be the full
/// circumference of the ring in <c>StrokeDashArray</c> units (circumference / StrokeThickness).
/// </summary>
public sealed class TimeToStrokeDashOffsetConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
if (parameter is not string circumferenceStr ||
!double.TryParse(circumferenceStr, NumberStyles.Float, CultureInfo.InvariantCulture,
out var circumference))
return 0.0;

if (values.Length < 2 ||
values[0] is not double time ||
values[1] is not double timeMax ||
timeMax == 0 ||
time <= 0)
return circumference + 1.0;

var progress = (double)time / timeMax;

return (1.0 - progress) * circumference;
}

public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
36 changes: 36 additions & 0 deletions Source/NETworkManager.Localization/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Source/NETworkManager.Localization/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3998,4 +3998,16 @@ You can copy your profile files from “{0}” to “{1}” to migrate your exis

You can copy your profile files from “{0}” to “{1}” to migrate your existing profiles, if necessary. The application must be closed for this to prevent the profiles from being overwritten.</value>
</data>
<data name="NetworkConnection" xml:space="preserve">
<value>Network connection</value>
</data>
<data name="NetworkStatus" xml:space="preserve">
<value>Network Status</value>
</data>
<data name="ToolTip_Show" xml:space="preserve">
<value>Show</value>
</data>
<data name="ToolTip_Reload" xml:space="preserve">
<value>Reload</value>
</data>
</root>
103 changes: 71 additions & 32 deletions Source/NETworkManager/StatusWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,88 @@
xmlns:resources="clr-namespace:NETworkManager.Properties"
xmlns:networkManager="clr-namespace:NETworkManager"
xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" d:DataContext="{d:DesignInstance networkManager:StatusWindow}"
Title="{x:Static resources:Resources.NETworkManager_ProjectName}"
TitleAlignment="Left"
Style="{DynamicResource DefaultWindow}"
Deactivated="MetroWindow_Deactivated"
Height="280" Width="950"
Deactivated="MetroWindow_Deactivated"
Topmost="True"
ShowInTaskbar="False"
Width="950"
Height="241"
ResizeMode="NoResize"
IsWindowDraggable="False"
ShowMinButton="False"
ShowMaxRestoreButton="False"
ShowCloseButton="False"
ShowTitleBar="False"
ShowCloseButton="True"
ShowTitleBar="True"
Closing="MetroWindow_Closing">
<mah:MetroWindow.Resources>
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
<converters:TimeToStrokeDashOffsetConverter x:Key="TimeToStrokeDashOffsetConverter" />
</mah:MetroWindow.Resources>
<Grid Margin="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="10" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ContentControl x:Name="ContentControlNetworkConnection" Grid.Row="0" />
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<mah:MetroProgressBar Grid.Column="0" Minimum="0" Maximum="{Binding TimeMax}" Value="{Binding Time}"
Visibility="{Binding ShowTime, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="150" />
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Content="{x:Static localization:Strings.Reload}" Command="{Binding ReloadCommand}"
Style="{StaticResource DefaultButton}" Margin="0,0,10,0" />
<Button Content="{x:Static localization:Strings.Show}" Command="{Binding ShowMainWindowCommand}"
Style="{StaticResource DefaultButton}" Margin="0,0,10,0" />
<Button Content="{x:Static localization:Strings.Close}" Command="{Binding CloseCommand}"
Style="{StaticResource DefaultButton}" />
</StackPanel>
<mah:MetroWindow.LeftWindowCommands>
<mah:WindowCommands ShowSeparators="False">
<!-- Countdown progress ring -->
<Grid Width="20" Height="20"
Visibility="{Binding ShowTime, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
VerticalAlignment="Center"
Margin="10,0,0,0">
<!-- Track (background ring) -->
<Ellipse StrokeThickness="2.5"
Stroke="{DynamicResource MahApps.Brushes.Accent}"
Opacity="0.2" />
<!-- Foreground arc that shrinks as time counts down -->
<Ellipse StrokeThickness="2.5"
Stroke="{DynamicResource MahApps.Brushes.Accent}"
StrokeDashCap="Round"
StrokeDashArray="22 100"
RenderTransformOrigin="0.5,0.5">
<Ellipse.RenderTransform>
<RotateTransform Angle="-90" />
</Ellipse.RenderTransform>
<Ellipse.StrokeDashOffset>
<MultiBinding Converter="{StaticResource TimeToStrokeDashOffsetConverter}"
ConverterParameter="22.0">
<Binding Path="Time" />
<Binding Path="TimeMax" />
</MultiBinding>
</Ellipse.StrokeDashOffset>
</Ellipse>
</Grid>
</Grid>
</Grid>
</mah:WindowCommands>
</mah:MetroWindow.LeftWindowCommands>
<mah:MetroWindow.RightWindowCommands>
<mah:WindowCommands ShowSeparators="False">
<Button Command="{Binding Path=ReloadCommand}"
ToolTip="{x:Static Member=localization:Strings.ToolTip_Reload}"
Cursor="Hand"
Focusable="False"
Margin="0,0,5,0">
<StackPanel Orientation="Horizontal">
<Rectangle Width="16" Height="16"
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Refresh}" />
</Rectangle.OpacityMask>
</Rectangle>
</StackPanel>
</Button>
<Button Command="{Binding Path=ShowMainWindowCommand}"
ToolTip="{x:Static Member=localization:Strings.ToolTip_Show}"
Cursor="Hand"
Focusable="False"
Margin="0,0,5,0">
<StackPanel Orientation="Horizontal">
<Rectangle Width="16" Height="16"
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=OpenInNew}" />
</Rectangle.OpacityMask>
</Rectangle>
</StackPanel>
</Button>
</mah:WindowCommands>
</mah:MetroWindow.RightWindowCommands>
<ContentControl Margin="10,5,10,10" x:Name="ContentControlNetworkConnection" />
</mah:MetroWindow>
35 changes: 23 additions & 12 deletions Source/NETworkManager/StatusWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
using NETworkManager.Views;
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Threading;
Expand All @@ -19,9 +21,11 @@ public StatusWindow(MainWindow mainWindow)
InitializeComponent();
DataContext = this;

Title = $"NETworkManager {AssemblyManager.Current.Version} - {Localization.Resources.Strings.NetworkStatus}";

_mainWindow = mainWindow;

_dispatcherTimerClose.Interval = new TimeSpan(0, 0, 0, 0, 250);
_dispatcherTimerClose.Interval = TimeSpan.FromMilliseconds(16);
_dispatcherTimerClose.Tick += DispatcherTimerTime_Tick;

_networkConnectionView = new NetworkConnectionWidgetView();
Expand All @@ -43,8 +47,8 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)

#region Variables

// Set priority to make the ui smoother
private readonly DispatcherTimer _dispatcherTimerClose = new(DispatcherPriority.Normal);
private readonly DispatcherTimer _dispatcherTimerClose = new(DispatcherPriority.Render);
private readonly Stopwatch _stopwatch = new();

private readonly MainWindow _mainWindow;
private readonly NetworkConnectionWidgetView _networkConnectionView;
Expand All @@ -64,9 +68,9 @@ public bool ShowTime
}
}

private int _timeMax;
private double _timeMax;

public int TimeMax
public double TimeMax
{
get => _timeMax;
private set
Expand All @@ -79,9 +83,9 @@ private set
}
}

private int _time;
private double _time;

public int Time
public double Time
{
get => _time;
set
Expand Down Expand Up @@ -153,6 +157,8 @@ public void ShowWindow(bool enableCloseTimer = false)
// Check the network connection
Check();

enableCloseTimer = true;

// Close the window after a certain time
if (enableCloseTimer)
{
Expand All @@ -166,9 +172,10 @@ public void ShowWindow(bool enableCloseTimer = false)

private void SetupCloseTimer()
{
Time = SettingsManager.Current.Status_WindowCloseTime * 4;
TimeMax = Time;
TimeMax = SettingsManager.Current.Status_WindowCloseTime;
Time = TimeMax;

_stopwatch.Restart();
ShowTime = true;
_dispatcherTimerClose.Start();
}
Expand All @@ -189,18 +196,22 @@ private void MetroWindow_Closing(object sender, CancelEventArgs e)
Hide();
}

private void DispatcherTimerTime_Tick(object sender, EventArgs e)
private async void DispatcherTimerTime_Tick(object sender, EventArgs e)
{
Time--;
Time = Math.Max(0.0, TimeMax - _stopwatch.Elapsed.TotalSeconds);

if (Time > 0)
return;

_dispatcherTimerClose.Stop();
_stopwatch.Stop();

await Task.Delay(250);

ShowTime = false;

Hide();
}
Comment on lines +199 to 214
Copy link

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DispatcherTimerTime_Tick stops the timer and then awaits Task.Delay(250). If the window is shown again during that delay and a new close-timer session starts, the continuation from the previous tick can still run and call Hide()/set ShowTime = false, unexpectedly hiding the newly shown window. Consider removing the delay or guarding it with a cancellation token / monotonically increasing "session id" so only the latest timer session is allowed to hide the window.

Copilot uses AI. Check for mistakes.

#endregion
}
}
2 changes: 2 additions & 0 deletions Website/docs/changelog/next-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Release date: **xx.xx.2025**

## Improvements

- Redesign Status Window to make it more compact [#3359](https://github.com/BornToBeRoot/NETworkManager/pull/3359)

## Bug Fixes

**PowerShell**
Expand Down