Missing tooltip fix

- Resolved: #2208
rocksdanister · Apr 30, 2024 · b26eee5 · b26eee5
1 parent da24d0e
commit b26eee5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml
@@ -148,6 +148,11 @@
                         x:Name="addWallpaperLabel"
                         x:Uid="AddWallpaper"
                         Click="AddWallpaperButton_Click">
+                        <ToolTipService.ToolTip>
+                            <ToolTip>
+                                <TextBlock x:Uid="AddWallpaperDrop" />
+                            </ToolTip>
+                        </ToolTipService.ToolTip>
                         <AppBarButton.Icon>
                             <FontIcon Glyph="&#xE710;" />
                         </AppBarButton.Icon>
@@ -158,6 +163,11 @@
                         x:Name="controlPanelLabel"
                         x:Uid="ActiveWallpapers"
                         Click="ControlPanelButton_Click">
+                        <ToolTipService.ToolTip>
+                            <ToolTip>
+                                <TextBlock x:Name="controlPanelTooltip" />
+                            </ToolTip>
+                        </ToolTipService.ToolTip>
                         <AppBarButton.Icon>
                             <FontIcon
                                 x:Name="controlPanelMonitor"

diff --git a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs
@@ -98,6 +98,7 @@ public sealed partial class MainWindow : WindowEx
             Root.DataContext = mainViewModel;
             i18n = ResourceLoader.GetForViewIndependentUse();
             this.controlPanelLabel.Label = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}";
+            this.controlPanelTooltip.Text = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}";
             controlPanelMonitor.Glyph = monitorGlyphs[desktopCore.Wallpapers.Count >= monitorGlyphs.Length ? monitorGlyphs.Length - 1 : desktopCore.Wallpapers.Count];
             desktopCore.WallpaperChanged += DesktopCore_WallpaperChanged;
             desktopCore.WallpaperError += DesktopCore_WallpaperError;
@@ -206,7 +207,8 @@ private void DesktopCore_WallpaperChanged(object sender, EventArgs e)
         {
             _ = this.DispatcherQueue.TryEnqueue(() =>
             {
-                //wallpaper focus steal fix.
+                //Wallpaper focus steal fix.
+                //Note: This is no longer required.
                 if (this.Visible)
                 {
                     if (!userSettings.Settings.ControlPanelOpened)
@@ -223,6 +225,7 @@ private void DesktopCore_WallpaperChanged(object sender, EventArgs e)
                     }
                 }
                 controlPanelLabel.Label = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}";
+                controlPanelTooltip.Text = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}";
                 controlPanelMonitor.Glyph = monitorGlyphs[desktopCore.Wallpapers.Count >= monitorGlyphs.Length ? monitorGlyphs.Length - 1 : desktopCore.Wallpapers.Count];
             });
         }