Fix label size setting not affecting UI and empty dropdown on fresh install

frd1201 · frd1201 · commit f2aaba861665 · 2025-12-22T09:23:38.000+01:00
diff --git a/AppGroup/EditGroupWindow.xaml.cs b/AppGroup/EditGroupWindow.xaml.cs
@@ -543,6 +543,29 @@ await Task.Run(async () =>
                         });
                     }
                 }
+                else {
+                    // Config file doesn't exist (fresh install) - initialize with defaults
+                    DispatcherQueue.TryEnqueue(() =>
+                    {
+                        groupName = "";
+                        GroupHeader.IsOn = false;
+                        GroupNameTextBox.Text = string.Empty;
+                        GroupColComboBox.Items.Clear();
+                        selectedIconPath = string.Empty;
+                        IconPreviewImage.Source = new BitmapImage(new Uri("ms-appx:///default_preview.png"));
+
+                        ApplicationCount.Text = string.Empty;
+                        ExeFiles.Clear();
+                        IconGridComboBox.Items.Clear();
+                        IconGridComboBox.Visibility = Visibility.Collapsed;
+
+                        // Initialize label settings for new groups on fresh install
+                        InitializeLabelSizeComboBox();
+                        ShowLabels.IsOn = false;
+                        LabelSizePanel.Opacity = 0.5;
+                        LabelSizeComboBox.IsEnabled = false;
+                    });
+                }
 
                 await Task.Run(() => Task.Delay(100));
 
diff --git a/AppGroup/IconCache.cs b/AppGroup/IconCache.cs
@@ -61,7 +61,7 @@ public static async Task<BitmapImage> LoadImageFromPathAsync(string filePath) {
             return bitmapImage;
         }
         public static async Task<string> GetIconPathAsync(string filePath) {
-            if (string.IsNullOrEmpty(filePath)) return null;
+            if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath)) return null;
 
             string cacheKey = ComputeFileCacheKey(filePath);
 
@@ -103,6 +103,9 @@ public static void SaveIconCache() {
         }
 
         public static string ComputeFileCacheKey(string filePath) {
+            if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath)) {
+                return filePath ?? string.Empty;
+            }
             var fileInfo = new FileInfo(filePath);
             return $"{filePath}_{fileInfo.LastWriteTimeUtc}_{fileInfo.Length}";
         }
diff --git a/AppGroup/PopupWindow.xaml.cs b/AppGroup/PopupWindow.xaml.cs
@@ -208,6 +208,11 @@ private void InitializeTemplates() {
                               VerticalAlignment=""Center""/>
             </ItemsPanelTemplate>");
 
+            // Label templates will be created dynamically in CreateLabelTemplates() with the actual font size
+        }
+
+        // Create label templates with the specified font size
+        private void CreateLabelTemplates(int fontSize) {
             // Create item template with labels
             const int EFFECTIVE_BUTTON_WIDTH_WITH_LABEL = BUTTON_SIZE_WITH_LABEL + (BUTTON_MARGIN * 2);
             _itemTemplateWithLabel = (DataTemplate)XamlReader.Load(
@@ -225,7 +230,7 @@ private void InitializeTemplates() {
                HorizontalAlignment=""Center""
                Margin=""4,6,4,2"" />
         <TextBlock Text=""{{Binding ToolTip}}""
-                   FontSize=""{DEFAULT_LABEL_SIZE}""
+                   FontSize=""{fontSize}""
                    TextTrimming=""CharacterEllipsis""
                    TextAlignment=""Center""
                    HorizontalAlignment=""Center""
@@ -263,7 +268,7 @@ private void InitializeTemplates() {
                    VerticalAlignment=""Center""
                    Margin=""0,0,8,0"" />
             <TextBlock Text=""{{Binding ToolTip}}""
-                       FontSize=""{DEFAULT_LABEL_SIZE}""
+                       FontSize=""{fontSize}""
                        TextTrimming=""CharacterEllipsis""
                        VerticalAlignment=""Center""
                        MaxWidth=""{BUTTON_WIDTH_HORIZONTAL_LABEL - ICON_SIZE - 12}""
@@ -345,6 +350,11 @@ private void InitializeWindow() {
                 _labelSize = filteredGroup.Value.LabelSize > 0 ? filteredGroup.Value.LabelSize : DEFAULT_LABEL_SIZE;
                 _currentColumns = maxColumns;
 
+                // Create label templates with the actual font size from config
+                if (_showLabels) {
+                    CreateLabelTemplates(_labelSize);
+                }
+
                 if (!int.TryParse(filteredGroup.Key, out _groupId)) {
                     Debug.WriteLine($"Error: Group key '{filteredGroup.Key}' is not a valid integer ID");
                     return;

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static async Task<BitmapImage> LoadImageFromPathAsync(string filePath) {`
`61`	`61`	`return bitmapImage;`
`62`	`62`	`}`
`63`	`63`	`public static async Task<string> GetIconPathAsync(string filePath) {`
`64`		`- if (string.IsNullOrEmpty(filePath)) return null;`
	`64`	`+ if (string.IsNullOrEmpty(filePath) \|\| !File.Exists(filePath)) return null;`
`65`	`65`
`66`	`66`	`string cacheKey = ComputeFileCacheKey(filePath);`
`67`	`67`
`@@ -103,6 +103,9 @@ public static void SaveIconCache() {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`public static string ComputeFileCacheKey(string filePath) {`
	`106`	`+ if (string.IsNullOrEmpty(filePath) \|\| !File.Exists(filePath)) {`
	`107`	`+ return filePath ?? string.Empty;`
	`108`	`+ }`
`106`	`109`	`var fileInfo = new FileInfo(filePath);`
`107`	`110`	`return $"{filePath}_{fileInfo.LastWriteTimeUtc}_{fileInfo.Length}";`
`108`	`111`	`}`