Move update banner into the top bar so that the bottom toolbar can still be used when an update is available

Author: Iridium-IO

CompactGUI.Watcher/CompactGUI.Watcher.vbproj

@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup>

CompactGUI/CompactGUI.vbproj

@@ -44,12 +44,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Gameloop.Vdf" Version="0.6.2" />
-    <PackageReference Include="MethodTimer.Fody" Version="3.2.0" />
+    <PackageReference Include="MethodTimer.Fody" Version="3.2.0" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="ModernWpfUis" Version="1.4.0" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" PrivateAssets="All" />
     <PackageReference Include="System.Management" Version="6.0.0" />
     <PackageReference Include="ValueConverters" Version="2.2.10" />
   </ItemGroup>

CompactGUI/Views/MainWindow.xaml

@@ -530,28 +530,53 @@
 
         </VisualStateManager.VisualStateGroups>
 
-        <Grid x:Name="titleBar" Height="{Binding ElementName=MainWindow, Path=(ui:TitleBar.Height)}" Panel.ZIndex="2" VerticalAlignment="Top" >
+    <Grid x:Name="titleBar"
+          Height="{Binding ElementName=MainWindow, Path=(ui:TitleBar.Height)}" Panel.ZIndex="2" VerticalAlignment="Top" >
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <ui:TitleBarButton x:Name="uiBtnOptions" Margin="10,5,0,0"
-                Grid.Column="0"  HoverForeground="White" InactiveForeground="#80FFFFFF" HoverBackground="#00000000" PressedBackground="#00000000" PressedForeground="#40FFFFFF"
+      <ui:TitleBarButton x:Name="uiBtnOptions"
+                         Margin="10,2,0,0"
+                         Panel.ZIndex="2" HorizontalAlignment="Left"
+                         Grid.Column="0"  HoverForeground="White" InactiveForeground="#80FFFFFF" HoverBackground="#00000000" PressedBackground="#00000000" PressedForeground="#40FFFFFF"
                 Content="&#xE713;" FontSize="16" Width="20"
                 ContentTemplate="{x:Null}" />
-        </Grid>
 
-        <!--Update Banner-->
-        <Grid x:Name="uiUpdateBanner" VerticalAlignment="Bottom" Height="30" Panel.ZIndex="2" Background="#FF468E56" Visibility="{Binding UpdateAvailable.Item1, Converter={StaticResource BoolToVisConverter}}"  Cursor="Hand" MouseUp="uiUpdateBanner_MouseUp">
-            <Grid.Effect>
-                <DropShadowEffect Direction="90" Opacity="0.15" BlurRadius="6"/>
-            </Grid.Effect>
+      <ui:TitleBarButton x:Name="uiUpdateText" Panel.ZIndex="5"
+                 d:Content="update available  -  v3.0a2"
+                 Content="{Binding UpdateAvailable.Item2}"
+                         FontSize="14"
+                         FontFamily="Segoe UI"
+                         Width="200"
+                         Visibility="{Binding UpdateAvailable.Item1, Converter={StaticResource BoolToVisConverter}}"
+                         Click="uiUpdateBanner_MouseUp"
+                 HorizontalAlignment="Center"
+                 VerticalAlignment="Center"
+                         Foreground="White"
+                         InactiveForeground="#80FFFFFF"
+                         HoverBackground="#00000000" HoverForeground="#40FFFFFF"
+                         PressedBackground="#00000000"
+                         PressedForeground="#20FFFFFF" />
+      <!--Update Banner-->
+      <Grid x:Name="uiUpdateBanner"
+            VerticalAlignment="Top" HorizontalAlignment="Stretch"
+            Height="{Binding ElementName=MainWindow, Path=(ui:TitleBar.Height)}" IsHitTestVisible="False"
+            Background="#AA468E56"
+            Visibility="{Binding UpdateAvailable.Item1, Converter={StaticResource BoolToVisConverter}}"
+            Cursor="Hand">
+        <Grid.Effect>
+          <DropShadowEffect Direction="90"
+                            Opacity="0.15"
+                            BlurRadius="6" />
+        </Grid.Effect>
+
+      </Grid>
+    </Grid>
 
-            <TextBlock x:Name="uiUpdateText" d:Text="update available  -  v3.0a2" Text="{Binding UpdateAvailable.Item2}" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-        </Grid>
+   
 
-        <!--Main information section / results of analysis-->
+    <!--Main information section / results of analysis-->
         <Grid x:Name="mainSection" VerticalAlignment="Top" Panel.ZIndex="1">
             <Grid.Background>
                 <LinearGradientBrush MappingMode="RelativeToBoundingBox" >

CompactGUI/Views/MainWindow.xaml.vb

@@ -23,7 +23,9 @@ Class MainWindow
         ViewModel.SelectFolder()
     End Sub
 
-    Private Sub uiUpdateBanner_MouseUp(sender As Object, e As MouseButtonEventArgs)
+    Private Sub uiUpdateBanner_MouseUp(sender As Object, e As RoutedEventArgs)
+
+
         Process.Start(New ProcessStartInfo("https://github.com/IridiumIO/CompactGUI/releases/") With {.UseShellExecute = True})
     End Sub