Feature: Adjust status window design

Author: BornToBeRoot

Source/NETworkManager.Converters/TimeToStrokeDashOffsetConverter.cs

@@ -88,7 +88,7 @@ public NotificationWindow(PackIconMaterialKind iconKind, string iconColor, strin
         // message wraps to more lines the whole stack must re-anchor to the bottom edge.
         SizeChanged += (_, _) => NotificationManager.RepositionAll();
 
-        _timer.Interval = TimeSpan.FromMilliseconds(16);
+        _timer.Interval = TimeSpan.FromMilliseconds(33);
         _timer.Tick += Timer_Tick;
     }
 

Source/NETworkManager/NotificationWindow.xaml.cs

@@ -5,7 +5,6 @@
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                  xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
                  xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-                 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"
@@ -16,49 +15,16 @@
                  Topmost="True"
                  ShowInTaskbar="False"
                  Width="950"
-                 Height="241"                 
+                 SizeToContent="Height"
                  ResizeMode="NoResize"
                  IsWindowDraggable="False"
                  ShowMinButton="False"
                  ShowMaxRestoreButton="False"
                  ShowCloseButton="True"
-                 ShowTitleBar="True"
                  Closing="MetroWindow_Closing">
     <mah:MetroWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
-        <converters:TimeToStrokeDashOffsetConverter x:Key="TimeToStrokeDashOffsetConverter" />
     </mah:MetroWindow.Resources>
-    <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>
-        </mah:WindowCommands>
-    </mah:MetroWindow.LeftWindowCommands>
     <mah:MetroWindow.RightWindowCommands>
         <mah:WindowCommands ShowSeparators="False">
             <Button Command="{Binding Path=ShowMainWindowCommand}"                    
@@ -77,5 +43,23 @@
             </Button>            
         </mah:WindowCommands>
     </mah:MetroWindow.RightWindowCommands>
-    <ContentControl Margin="10,5,10,10" x:Name="ContentControlNetworkConnection" />
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <ContentControl Grid.Column="0" Grid.Row="0" 
+                        x:Name="ContentControlNetworkConnection"
+                        Margin="10" />
+        <ProgressBar Grid.Column="0" Grid.Row="1"
+                     Height="3"
+                     MinHeight="3"
+                     Margin="0"
+                     Minimum="0"
+                     Maximum="{Binding TimeMax, Mode=OneWay}"
+                     Value="{Binding Time, Mode=OneWay}"
+                     Visibility="{Binding ShowTime, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                     BorderThickness="0"
+                     Padding="0" />
+    </Grid>
 </mah:MetroWindow>

Source/NETworkManager/StatusWindow.xaml

@@ -25,11 +25,15 @@ public StatusWindow(MainWindow mainWindow)
 
         _mainWindow = mainWindow;
 
-        _dispatcherTimerClose.Interval = TimeSpan.FromMilliseconds(16);
+        _dispatcherTimerClose.Interval = TimeSpan.FromMilliseconds(33);
         _dispatcherTimerClose.Tick += DispatcherTimerTime_Tick;
 
         _networkConnectionView = new NetworkConnectionWidgetView();
         ContentControlNetworkConnection.Content = _networkConnectionView;
+
+        // With SizeToContent="Height" the height is only known after layout; re-anchor to the
+        // bottom-right whenever it changes so the window does not drift to the top of the screen.
+        SizeChanged += (_, _) => UpdatePosition();
     }
 
     #endregion
@@ -84,7 +88,9 @@ public double Time
         get;
         set
         {
-            if (value == field)
+            // Same guard as NotificationWindow.TimeRemaining: ignore sub-0.001 changes so the
+            // countdown updates at the same cadence in both windows.
+            if (Math.Abs(value - field) < 0.001)
                 return;
 
             field = value;
@@ -128,15 +134,9 @@ private void Check()
     /// <param name="enableCloseTimer">Automatically close the window after a certain time.</param>
     public void ShowWindow(bool enableCloseTimer = false)
     {
-        // Set window position on primary screen
-        // ToDo: User setting...
-        if (Screen.PrimaryScreen != null)
-        {
-            var scaleFactor = System.Windows.Media.VisualTreeHelper.GetDpi(this).DpiScaleX;
-
-            Left = Screen.PrimaryScreen.WorkingArea.Right / scaleFactor - Width - 10;
-            Top = Screen.PrimaryScreen.WorkingArea.Bottom / scaleFactor - Height - 10;
-        }
+        // Position bottom-right on the primary screen. With SizeToContent="Height" the final
+        // height is only known after layout, so this is refined again in SizeChanged.
+        UpdatePosition();
 
         // Show the window
         Show();
@@ -155,6 +155,23 @@ public void ShowWindow(bool enableCloseTimer = false)
         Activate();
     }
 
+    /// <summary>
+    ///     Anchors the window to the bottom-right corner of the primary screen. Uses
+    ///     <see cref="FrameworkElement.ActualHeight"/> (not Height, which is NaN while
+    ///     SizeToContent is active) so the window stays bottom-anchored as its height changes.
+    /// </summary>
+    private void UpdatePosition()
+    {
+        // ToDo: User setting...
+        if (Screen.PrimaryScreen == null)
+            return;
+
+        var scaleFactor = System.Windows.Media.VisualTreeHelper.GetDpi(this).DpiScaleX;
+
+        Left = Screen.PrimaryScreen.WorkingArea.Right / scaleFactor - Width - 10;
+        Top = Screen.PrimaryScreen.WorkingArea.Bottom / scaleFactor - ActualHeight - 10;
+    }
+
     private void SetupCloseTimer()
     {
         TimeMax = SettingsManager.Current.Status_WindowCloseTime;
@@ -183,9 +200,12 @@ private void MetroWindow_Closing(object sender, CancelEventArgs e)
 
     private async void DispatcherTimerTime_Tick(object sender, EventArgs e)
     {
-        Time = Math.Max(0.0, TimeMax - _stopwatch.Elapsed.TotalSeconds);
+        // Use a local for the close decision — the Time setter now ignores sub-0.001 changes, so
+        // reading the property back could stay stuck at a tiny positive value and never hide.
+        var remaining = Math.Max(0.0, TimeMax - _stopwatch.Elapsed.TotalSeconds);
+        Time = remaining;
 
-        if (Time > 0)
+        if (remaining > 0)
             return;
 
         _dispatcherTimerClose.Stop();