diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
index 76c9298d19..bd81debf9e 100644
--- a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
+++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MainWindow.xaml
@@ -4,18 +4,19 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:animations="using:CommunityToolkit.WinUI.Animations"
+ xmlns:local="using:PowerDisplay"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
xmlns:ui="using:CommunityToolkit.WinUI"
xmlns:vm="using:PowerDisplay.ViewModels"
xmlns:winuiex="using:WinUIEx"
+ MinWidth="0"
+ MinHeight="0"
IsAlwaysOnTop="True"
IsMaximizable="False"
IsMinimizable="False"
IsResizable="False"
IsShownInSwitchers="False"
- IsTitleBarVisible="False"
- MinHeight="0"
- MinWidth="0">
+ IsTitleBarVisible="False">
@@ -81,10 +82,10 @@
-
-
+
+
-
+
-
-
-
+ IsBuiltIn="{x:Bind IsInternal, Mode=OneWay}"
+ MonitorNumber="{x:Bind MonitorNumber, Mode=OneWay}" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Padding="8,0,16,8"
+ Background="{ThemeResource LayerOnAcrylicFillColorDefaultBrush}"
+ BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+ BorderThickness="1"
+ CornerRadius="{StaticResource OverlayCornerRadius}">
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+ Visibility="Visible">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -278,14 +249,33 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MonitorIcon.xaml.cs b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MonitorIcon.xaml.cs
new file mode 100644
index 0000000000..3948332d0b
--- /dev/null
+++ b/src/modules/powerdisplay/PowerDisplay/PowerDisplayXAML/MonitorIcon.xaml.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace PowerDisplay;
+
+public sealed partial class MonitorIcon : UserControl
+{
+ public MonitorIcon()
+ {
+ InitializeComponent();
+ }
+
+ public bool IsBuiltIn
+ {
+ get => (bool)GetValue(IsBuiltInProperty);
+ set => SetValue(IsBuiltInProperty, value);
+ }
+
+ public static readonly DependencyProperty IsBuiltInProperty = DependencyProperty.Register(nameof(IsBuiltIn), typeof(bool), typeof(MonitorIcon), new PropertyMetadata(false, OnPropertyChanged));
+
+ public int MonitorNumber
+ {
+ get => (int)GetValue(MonitorNumberProperty);
+ set => SetValue(MonitorNumberProperty, value);
+ }
+
+ public static readonly DependencyProperty MonitorNumberProperty = DependencyProperty.Register(nameof(MonitorNumber), typeof(int), typeof(MonitorIcon), new PropertyMetadata(0, OnPropertyChanged));
+
+ private static void OnPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var monIcon = (MonitorIcon)d;
+ if (monIcon.IsBuiltIn)
+ {
+ VisualStateManager.GoToState(monIcon, "BuiltIn", true);
+ }
+ else
+ {
+ VisualStateManager.GoToState(monIcon, "Monitor", true);
+ }
+ }
+}
diff --git a/src/modules/powerdisplay/PowerDisplay/ViewModels/MonitorViewModel.cs b/src/modules/powerdisplay/PowerDisplay/ViewModels/MonitorViewModel.cs
index e1c22ad0d3..cf1d2b8b36 100644
--- a/src/modules/powerdisplay/PowerDisplay/ViewModels/MonitorViewModel.cs
+++ b/src/modules/powerdisplay/PowerDisplay/ViewModels/MonitorViewModel.cs
@@ -283,10 +283,10 @@ public partial class MonitorViewModel : INotifyPropertyChanged, IDisposable
{
// Check if there's more than one visible monitor and MonitorNumber is valid
// Set the limit to zero for debugging.
- if (_mainViewModel != null && _mainViewModel.Monitors.Count > 0 && MonitorNumber > 0)
+ /* if (_mainViewModel != null && _mainViewModel.Monitors.Count > 0 && MonitorNumber > 0)
{
return $"{Name} {MonitorNumber}";
- }
+ } */
return Name;
}