Draw device state in the bottom corner

davkean · Nov 12, 2021 · 7d68152 · 7d68152
1 parent c2c6f2e
commit 7d68152
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/AudioSwitcher/Presentation/Drawing/DrawingServices.cs b/src/AudioSwitcher/Presentation/Drawing/DrawingServices.cs
@@ -8,7 +8,7 @@ namespace AudioSwitcher.Presentation.Drawing
 {
     internal static class DrawingServices
     {
-        public static Image CreateOverlayedImage(Image image, Image overlayImage, Size size)
+        public static Image CreateOverlayedImage(Image image, Image overlayImage, Size size, bool bottomCorner)
         {
             if (image == null || overlayImage == null)
                 throw new ArgumentNullException(image == null ? "image" : "overlayImage");
@@ -18,7 +18,16 @@ public static Image CreateOverlayedImage(Image image, Image overlayImage, Size s
             using (var g = Graphics.FromImage(copy))
             {
                 g.DrawImage(image, 0, 0);
-                g.DrawImage(overlayImage, 0, 0);
+
+                if (bottomCorner)
+                {
+                    g.DrawImage(overlayImage, size.Width - overlayImage.Width, size.Height - overlayImage.Height, overlayImage.Width, overlayImage.Height);
+                }
+                else
+                {
+                    g.DrawImage(overlayImage, 0, 0);
+                }
+
                 g.Save();
 
                 return copy;

diff --git a/src/AudioSwitcher/UI/ViewModels/AudioDeviceViewModel.cs b/src/AudioSwitcher/UI/ViewModels/AudioDeviceViewModel.cs
@@ -1,9 +1,9 @@
 // -----------------------------------------------------------------------
 // Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-
 using AudioSwitcher.Audio;
 using AudioSwitcher.Presentation.Drawing;
 using AudioSwitcher.Presentation.UI;
@@ -177,15 +177,15 @@ private Image GetImage(string iconPath)
             if (deviceImage == null)
                 return null;
 
-            Image overlayImage = GetOverlayImage();
+            Image overlayImage = GetOverlayImage(out bool bottomCorner);
             if (overlayImage == null)
                 return deviceImage;
 
             using (deviceImage)
             using (overlayImage)
             {
                 // Makes a copy
-                return DrawingServices.CreateOverlayedImage(deviceImage, overlayImage, deviceImage.Size);
+                return DrawingServices.CreateOverlayedImage(deviceImage, overlayImage, deviceImage.Size, bottomCorner);
             }
         }
 
@@ -218,8 +218,10 @@ private Icon GetIconFromDeviceIconPath(string iconPath)
             return icon;
         }
 
-        private Image GetOverlayImage()
+        private Image GetOverlayImage(out bool bottomCorner)
         {
+            bottomCorner = false;
+
             if (DefaultState.IsSet(AudioDeviceDefaultState.Multimedia))
             {   // Sound control panel shows the same icon between all and multimedia
                 return Resources.DefaultMultimediaDevice;
@@ -230,6 +232,8 @@ private Image GetOverlayImage()
                 return Resources.DefaultCommunicationsDevice;
             }
 
+            bottomCorner = true;
+
             switch (State)
             {
                 case AudioDeviceState.Disabled: