More tweakings to improve Dev Home compatibility

marticliment · marticliment · commit 569af0f4efc9 · 2024-03-23T01:26:00.000+01:00
diff --git a/src/Templates.cs b/src/Templates.cs
@@ -47,6 +47,7 @@ public static string GetData_NoWingetUI()
         {
             return "{ \"NoWingetUI\": true }";
         }
+        
         private const string NoWingetUI = @"
             {
                 ""type"": ""Container"",
@@ -78,6 +79,7 @@ public static string GetData_NoWingetUI()
                                 ""size"": ""Small""
                             }
                         ],
+                        ""verticalContentAlignment"": ""Center"",
                         ""height"": ""stretch""
                     },
                     {
@@ -90,7 +92,9 @@ public static string GetData_NoWingetUI()
                             }
                         ],
                         ""horizontalAlignment"": ""Center"",
-                        ""$when"": ""${$host.widgetSize!=\""small\""}""
+                        ""verticalContentAlignment"": ""Center"",
+                        ""$when"": ""${$host.widgetSize!=\""small\""}"",
+                        ""size"": ""Medium""
                     }
                 ],
                 ""verticalContentAlignment"": ""Center"",
@@ -182,6 +186,7 @@ public static string GetData_NoUpdatesFound()
                                 ""$when"": ""${$host.widgetSize!=\""small\""}""
                             }
                         ],
+                        ""verticalContentAlignment"": ""Center"",
                         ""height"": ""stretch""
                     },
                     {
@@ -220,11 +225,15 @@ private static string GeneratePackageStructure(int index)
                                     ""items"": [
                                         {
                                             ""type"": ""Image"",
-                                            ""url"": ""${Icon" + index.ToString()+ @"}""
+                                            ""url"": ""${Icon" + index.ToString()+ @"}"",
+                                            ""width"": ""24px"",
+                                            ""height"": ""24px"",
+                                            ""horizontalAlignment"": ""Center"",
+                                            ""altText"": ""📦""
                                         }
                                     ],
                                     ""verticalContentAlignment"": ""Center"",
-                                    ""minHeight"": ""36px"",
+                                    ""minHeight"": ""34px"",
                                     ""spacing"": ""None""
                                 },
                                 {
@@ -281,7 +290,7 @@ private static string GeneratePackageStructure(int index)
                                     ],
                                     ""verticalContentAlignment"": ""Center"",
                                     ""spacing"": ""None"",
-                                    ""minHeight"": ""36px"",
+                                    ""minHeight"": ""34px"",
                                     ""spacing"": ""None""
                                 }
                             ],
@@ -358,7 +367,6 @@ private static string GetUpdatesListTemplate(int numOfPackages)
             basestr += @"],
                         ""spacing"": ""None"",
                         ""showGridLines"": false,
-                        ""height"": ""stretch"",
                         ""verticalCellContentAlignment"": ""Top""
                     },
                     {
@@ -594,7 +602,8 @@ public static string GetData_UpdatesInCourse()
                             }
                         ],
                         ""horizontalAlignment"": ""Center"",
-                        ""$when"": ""${$host.widgetSize!=\""small\""}""
+                        ""$when"": ""${$host.widgetSize!=\""small\""}"",
+                            ""size"": ""Medium""
                     }
                 ],
                 ""verticalContentAlignment"": ""Center"",
diff --git a/src/WidgetProvider.cs b/src/WidgetProvider.cs
@@ -96,14 +96,16 @@ private void WingetUI_UpdateCheckFinished(object? sender, UpdatesCheckFinishedEv
                     }
                     else
                     {
+                        const int MEDIUM_MAX_UPDATES = 3; // Updates from 0 to 3 will be shown
+                        const int LARGE_MAX_UPDATES = 7; // Updates from 0 to 7 will be shown
                         upgradablePackages[i] = e.widget.AvailableUpdates[i];
-                        if (e.widget.size == WidgetSize.Medium && i == (3 + nullPackages) && e.widget.AvailableUpdates.Length > (3 + nullPackages))
+                        if (e.widget.size == WidgetSize.Medium && i == (MEDIUM_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > (MEDIUM_MAX_UPDATES + nullPackages))
                         {
                             i++;
                             packages += (e.widget.AvailableUpdates.Length - i).ToString() + " more packages can also be upgraded";
                             i = e.widget.AvailableUpdates.Length;
                         }
-                        else if (e.widget.size == WidgetSize.Large && i == (6 + nullPackages) && e.widget.AvailableUpdates.Length > (6 + nullPackages) && e.widget.AvailableUpdates.Length > 6)
+                        else if (e.widget.size == WidgetSize.Large && i == (LARGE_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > (LARGE_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > LARGE_MAX_UPDATES)
                         {
                             i++;
                             packages += (e.widget.AvailableUpdates.Length - i).ToString() + " more packages can also be upgraded";

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public static string GetData_NoWingetUI()`
`47`	`47`	`{`
`48`	`48`	`return "{ \"NoWingetUI\": true }";`
`49`	`49`	`}`
	`50`	`+`
`50`	`51`	`private const string NoWingetUI = @"`
`51`	`52`	`{`
`52`	`53`	`""type"": ""Container"",`
`@@ -78,6 +79,7 @@ public static string GetData_NoWingetUI()`
`78`	`79`	`""size"": ""Small""`
`79`	`80`	`}`
`80`	`81`	`],`
	`82`	`+ ""verticalContentAlignment"": ""Center"",`
`81`	`83`	`""height"": ""stretch""`
`82`	`84`	`},`
`83`	`85`	`{`
`@@ -90,7 +92,9 @@ public static string GetData_NoWingetUI()`
`90`	`92`	`}`
`91`	`93`	`],`
`92`	`94`	`""horizontalAlignment"": ""Center"",`
`93`		`- ""$when"": ""${$host.widgetSize!=\""small\""}""`
	`95`	`+ ""verticalContentAlignment"": ""Center"",`
	`96`	`+ ""$when"": ""${$host.widgetSize!=\""small\""}"",`
	`97`	`+ ""size"": ""Medium""`
`94`	`98`	`}`
`95`	`99`	`],`
`96`	`100`	`""verticalContentAlignment"": ""Center"",`
`@@ -182,6 +186,7 @@ public static string GetData_NoUpdatesFound()`
`182`	`186`	`""$when"": ""${$host.widgetSize!=\""small\""}""`
`183`	`187`	`}`
`184`	`188`	`],`
	`189`	`+ ""verticalContentAlignment"": ""Center"",`
`185`	`190`	`""height"": ""stretch""`
`186`	`191`	`},`
`187`	`192`	`{`
`@@ -220,11 +225,15 @@ private static string GeneratePackageStructure(int index)`
`220`	`225`	`""items"": [`
`221`	`226`	`{`
`222`	`227`	`""type"": ""Image"",`
`223`		`- ""url"": ""${Icon" + index.ToString()+ @"}""`
	`228`	`+ ""url"": ""${Icon" + index.ToString()+ @"}"",`
	`229`	`+ ""width"": ""24px"",`
	`230`	`+ ""height"": ""24px"",`
	`231`	`+ ""horizontalAlignment"": ""Center"",`
	`232`	`+ ""altText"": ""📦""`
`224`	`233`	`}`
`225`	`234`	`],`
`226`	`235`	`""verticalContentAlignment"": ""Center"",`
`227`		`- ""minHeight"": ""36px"",`
	`236`	`+ ""minHeight"": ""34px"",`
`228`	`237`	`""spacing"": ""None""`
`229`	`238`	`},`
`230`	`239`	`{`
`@@ -281,7 +290,7 @@ private static string GeneratePackageStructure(int index)`
`281`	`290`	`],`
`282`	`291`	`""verticalContentAlignment"": ""Center"",`
`283`	`292`	`""spacing"": ""None"",`
`284`		`- ""minHeight"": ""36px"",`
	`293`	`+ ""minHeight"": ""34px"",`
`285`	`294`	`""spacing"": ""None""`
`286`	`295`	`}`
`287`	`296`	`],`
`@@ -358,7 +367,6 @@ private static string GetUpdatesListTemplate(int numOfPackages)`
`358`	`367`	`basestr += @"],`
`359`	`368`	`""spacing"": ""None"",`
`360`	`369`	`""showGridLines"": false,`
`361`		`- ""height"": ""stretch"",`
`362`	`370`	`""verticalCellContentAlignment"": ""Top""`
`363`	`371`	`},`
`364`	`372`	`{`
`@@ -594,7 +602,8 @@ public static string GetData_UpdatesInCourse()`
`594`	`602`	`}`
`595`	`603`	`],`
`596`	`604`	`""horizontalAlignment"": ""Center"",`
`597`		`- ""$when"": ""${$host.widgetSize!=\""small\""}""`
	`605`	`+ ""$when"": ""${$host.widgetSize!=\""small\""}"",`
	`606`	`+ ""size"": ""Medium""`
`598`	`607`	`}`
`599`	`608`	`],`
`600`	`609`	`""verticalContentAlignment"": ""Center"",`
Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,16 @@ private void WingetUI_UpdateCheckFinished(object? sender, UpdatesCheckFinishedEv`
`96`	`96`	`}`
`97`	`97`	`else`
`98`	`98`	`{`
	`99`	`+ const int MEDIUM_MAX_UPDATES = 3; // Updates from 0 to 3 will be shown`
	`100`	`+ const int LARGE_MAX_UPDATES = 7; // Updates from 0 to 7 will be shown`
`99`	`101`	`upgradablePackages[i] = e.widget.AvailableUpdates[i];`
`100`		`- if (e.widget.size == WidgetSize.Medium && i == (3 + nullPackages) && e.widget.AvailableUpdates.Length > (3 + nullPackages))`
	`102`	`+ if (e.widget.size == WidgetSize.Medium && i == (MEDIUM_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > (MEDIUM_MAX_UPDATES + nullPackages))`
`101`	`103`	`{`
`102`	`104`	`i++;`
`103`	`105`	`packages += (e.widget.AvailableUpdates.Length - i).ToString() + " more packages can also be upgraded";`
`104`	`106`	`i = e.widget.AvailableUpdates.Length;`
`105`	`107`	`}`
`106`		`- else if (e.widget.size == WidgetSize.Large && i == (6 + nullPackages) && e.widget.AvailableUpdates.Length > (6 + nullPackages) && e.widget.AvailableUpdates.Length > 6)`
	`108`	`+ else if (e.widget.size == WidgetSize.Large && i == (LARGE_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > (LARGE_MAX_UPDATES + nullPackages) && e.widget.AvailableUpdates.Length > LARGE_MAX_UPDATES)`
`107`	`109`	`{`
`108`	`110`	`i++;`
`109`	`111`	`packages += (e.widget.AvailableUpdates.Length - i).ToString() + " more packages can also be upgraded";`