Merge pull request #19 from Apollo199999999/LauncherX-v2.1.2

LauncherX v2.1.2

LauncherXWinUI/Controls/GridViewItems/EditItemWindow.xaml.cs

@@ -1,5 +1,6 @@
 using LauncherXWinUI.Classes;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Imaging;
 using WinUIEx;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -13,6 +14,9 @@ namespace LauncherXWinUI.Controls.GridViewItems
     /// </summary>
     public sealed partial class EditItemWindow : WinUIEx.WindowEx
     {
+        // Variables to store the original DecodeWidth in the EditDialogImage
+        public int OriginalDecodeWidth = 0;
+
         public EditItemWindow()
         {
             this.InitializeComponent();
@@ -33,10 +37,18 @@ private void Container_Loaded(object sender, RoutedEventArgs e)
 
             // Disable maximise
             UIFunctionsClass.PreventWindowMaximise(this);
+
+            // Properly set the decode pixel width and height of the icon rendered
+            BitmapImage ItemIcon = EditDialogImage.Source as BitmapImage;
+            OriginalDecodeWidth = ItemIcon.DecodePixelWidth;
+            ItemIcon.DecodePixelWidth = (int)EditDialogImage.Width * 2;
         }
 
         private void CloseBtn_Click(object sender, RoutedEventArgs e)
         {
+            // Reset DecodePixelWidth and DecodePixelHeight of the BitmapImage in the EditDialogImage control - otherwise things will look weird in the main items grid
+            BitmapImage ItemIcon = EditDialogImage.Source as BitmapImage;
+            ItemIcon.DecodePixelWidth = OriginalDecodeWidth;
             this.Close();
         }
     }

LauncherXWinUI/Controls/GridViewItems/GridViewTile.xaml

@@ -31,14 +31,14 @@
             VerticalAlignment="Stretch"
             AllowDrop="True">
             <Grid.RowDefinitions>
-                <RowDefinition Height="auto" />
-                <RowDefinition Height="*" />
+                <RowDefinition Height="5*" />
+                <RowDefinition Height="2*" />
             </Grid.RowDefinitions>
 
             <Grid
                 Grid.Row="0"
                 HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
+                VerticalAlignment="Stretch"
                 AllowDrop="True">
                 <Image x:Name="TileImage" Stretch="Uniform" />
 
@@ -52,9 +52,8 @@
             <TextBlock
                 x:Name="TileText"
                 Grid.Row="1"
-                Margin="5,5,5,5"
                 HorizontalAlignment="Center"
-                VerticalAlignment="Bottom"
+                VerticalAlignment="Center"
                 AllowDrop="True"
                 TextAlignment="Center"
                 TextTrimming="CharacterEllipsis" />

LauncherXWinUI/Controls/GridViewItems/GridViewTile.xaml.cs

@@ -84,11 +84,9 @@ private static void OnSizeChanged(DependencyObject d, DependencyPropertyChangedE
                 gridViewTile.ControlBorder.Height = newHeight;
 
                 // Update image margin and dimensions
-                gridViewTile.TileImage.Margin = new Thickness(newSize * 22.5, newSize * 5, newSize * 22.5, 0);
-                gridViewTile.TileImage.Height = newWidth - newSize * 22.5 - newSize * 22.5;
+                gridViewTile.TileImage.Margin = new Thickness(0, newSize * 5, 0, 0);
                 gridViewTile.TileImage.Stretch = Stretch.Uniform;
                 gridViewTile.LinkedFolderImage.Margin = new Thickness(newSize * 10, newSize * 5, newSize * 22.5, 0);
-                gridViewTile.LinkedFolderImage.Height = newWidth - newSize * 22.5 - newSize * 22.5;
                 gridViewTile.LinkedFolderImage.Stretch = Stretch.Uniform;
 
                 // Update the font size of the textblock
@@ -542,7 +540,6 @@ private void MenuEditOption_Click(object sender, RoutedEventArgs e)
         {
             // Show the EditItemWindow
             editItemWindow = new EditItemWindow();
-
             editItemWindow.EditDialogImage.Source = this.ImageSource;
             editItemWindow.EditDisplayTextTextBox.Text = this.DisplayText;
             TempCustomImagePath = this.CustomImagePath;

LauncherXWinUI/Controls/GridViewItems/GridViewTileGroup.xaml

@@ -22,16 +22,23 @@
         AllowDrop="True"
         BorderThickness="2,2,2,3"
         CornerRadius="{ThemeResource ControlCornerRadius}">
-        <StackPanel
+        <Grid
             x:Name="GroupPanel"
             AllowDrop="True"
             PointerPressed="GroupPanel_PointerPressed"
             PointerReleased="GroupPanel_PointerReleased"
             RightTapped="GroupPanel_RightTapped"
             Tapped="GroupPanel_Tapped">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="5*" />
+                <RowDefinition Height="2*" />
+            </Grid.RowDefinitions>
 
             <Grid
                 x:Name="ItemsPreviewGrid"
+                Grid.Row="0"
+                Height="Auto"
+                MinWidth="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 AllowDrop="True">
@@ -47,9 +54,9 @@
 
             <TextBlock
                 x:Name="TileText"
-                Margin="5,5,5,5"
+                Grid.Row="1"
                 HorizontalAlignment="Center"
-                VerticalAlignment="Bottom"
+                VerticalAlignment="Center"
                 AllowDrop="True"
                 TextAlignment="Center"
                 TextTrimming="CharacterEllipsis" />
@@ -113,6 +120,6 @@
                         Text="Remove group from LauncherX" />
                 </MenuFlyout>
             </FlyoutBase.AttachedFlyout>
-        </StackPanel>
+        </Grid>
     </Border>
 </UserControl>

LauncherXWinUI/Controls/GridViewItems/GridViewTileGroup.xaml.cs

@@ -7,6 +7,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Windows.Security.Cryptography.Certificates;
 using Windows.UI;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -77,15 +78,12 @@ private static void OnSizeChanged(DependencyObject d, DependencyPropertyChangedE
                 // Update control dimensions
                 gridViewTileGroup.ControlBorder.Width = newWidth;
                 gridViewTileGroup.ControlBorder.Height = newHeight;
-                gridViewTileGroup.ItemsPreviewGrid.Margin = new Thickness(newSize * 22.5, newSize * 5, newSize * 22.5, 0);
-                gridViewTileGroup.ItemsPreviewGrid.Height = newWidth - newSize * 22.5 - newSize * 22.5;
-                gridViewTileGroup.ItemsPreviewGrid.Width = newWidth - newSize * 22.5 - newSize * 22.5;
+                gridViewTileGroup.ItemsPreviewGrid.Margin = new Thickness(0, newSize * 2.5, 0, 0);
 
                 // Update image controls
                 foreach (Image image in gridViewTileGroup.ItemsPreviewGrid.Children)
                 {
-                    image.Width = gridViewTileGroup.ItemsPreviewGrid.Width / 2.5;
-                    image.Height = gridViewTileGroup.ItemsPreviewGrid.Width / 2.5;
+                    image.Margin = new Thickness(newSize * 2.5);
                     image.Stretch = Stretch.Uniform;
                 }
 
@@ -162,10 +160,10 @@ public void UpdatePreview()
                     break;
                 }
 
+                double ControlSize = Math.Sqrt(Size);
                 Image image = new Image();
                 image.Source = Items[i].ImageSource;
-                image.Width = ItemsPreviewGrid.Width / 2.5;
-                image.Height = ItemsPreviewGrid.Width / 2.5;
+                image.Margin = new Thickness(ControlSize * 2.5);
                 image.Stretch = Stretch.Uniform;
                 image.HorizontalAlignment = HorizontalAlignment.Center;
                 image.VerticalAlignment = VerticalAlignment.Center;

LauncherXWinUI/LauncherXWinUI.csproj

@@ -19,9 +19,9 @@
     <Description>LauncherX - Modern app launcher for Windows</Description>
     <Copyright>Copyright © 2020-present ClickPhase</Copyright>
     <PackageProjectUrl>https://clickphase.vercel.app/launcherx</PackageProjectUrl>
-    <AssemblyVersion>2.1.1.0</AssemblyVersion>
-    <FileVersion>2.1.1.0</FileVersion>
-    <Version>2.1.1.0</Version>
+    <AssemblyVersion>2.1.2.0</AssemblyVersion>
+    <FileVersion>2.1.2.0</FileVersion>
+    <Version>2.1.2.0</Version>
     <PackageIcon>icon.png</PackageIcon>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -54,13 +54,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
+    <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240916" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
     <PackageReference Include="Octokit" Version="13.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
-    <PackageReference Include="WinUIEx" Version="2.3.4" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="WinUIEx" Version="2.5.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>