Rework notification windows

ViRb3 · Jan 28, 2020 · 08d737d · 08d737d
1 parent 785378e
commit 08d737d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 39 deletions.
diff --git a/source/SylphyHorn/Services/NotificationService.cs b/source/SylphyHorn/Services/NotificationService.cs
@@ -50,8 +50,7 @@ private static IDisposable ShowDesktopWindow(int index)
 			var vmodel = new NotificationWindowViewModel
 			{
 				Title = ProductInfo.Title,
-				Header = "Virtual Desktop Switched",
-				Body = "Current Desktop: Desktop " + index,
+				Body = $"Desktop {index}",
 			};
 			var source = new CancellationTokenSource();
 
@@ -94,8 +93,7 @@ private static IDisposable ShowPinWindow(IntPtr hWnd, PinOperations operation)
 			var vmodel = new NotificationWindowViewModel
 			{
 				Title = ProductInfo.Title,
-				Header = "Virtual Desktop",
-				Body = $"{(operation.HasFlag(PinOperations.Pin) ? "Pinned" : "Unpinned")} this {(operation.HasFlag(PinOperations.Window) ? "window" : "application")}",
+				Body = $"{(operation.HasFlag(PinOperations.Window) ? "Window" : "Application")} {(operation.HasFlag(PinOperations.Pin) ? "Pinned" : "Unpinned")}",
 			};
 			var source = new CancellationTokenSource();
 			var window = new PinWindow(hWnd)

diff --git a/source/SylphyHorn/UI/Bindings/NotificationWindowViewModel.cs b/source/SylphyHorn/UI/Bindings/NotificationWindowViewModel.cs
@@ -4,25 +4,6 @@ namespace SylphyHorn.UI.Bindings
 {
 	public class NotificationWindowViewModel : WindowViewModel
 	{
-		#region Header 変更通知プロパティ
-
-		private string _Header;
-
-		public string Header
-		{
-			get { return this._Header; }
-			set
-			{
-				if (this._Header != value)
-				{
-					this._Header = value;
-					this.RaisePropertyChanged();
-				}
-			}
-		}
-
-		#endregion
-
 		#region Body 変更通知プロパティ
 
 		private string _Body;

diff --git a/source/SylphyHorn/UI/PinWindow.xaml b/source/SylphyHorn/UI/PinWindow.xaml
@@ -13,7 +13,7 @@
 					   mc:Ignorable="d"
 					   d:DataContext="{d:DesignInstance bindings:NotificationWindowViewModel}"
 					   Title="{Binding Title}"
-					   Width="400"
+					   Width="355.462"
 					   Height="100"
 					   ResizeMode="NoResize"
 					   WindowStartupLocation="CenterScreen"
@@ -67,14 +67,9 @@
 
 	<DockPanel VerticalAlignment="Center"
 			   Margin="16,12">
-		<TextBlock DockPanel.Dock="Top"
-				   Text="{Binding Header}"
-				   FontFamily="Segoe UI Light, Meiryo UI"
-				   FontSize="18"
-				   Margin="2,0,0,-4" />
-		<TextBlock DockPanel.Dock="Top"
+        <TextBlock DockPanel.Dock="Top"
 				   Text="{Binding Body}"
 				   FontFamily="Segoe UI Light, Meiryo UI"
-				   FontSize="32" />
+				   FontSize="32" HorizontalAlignment="Center" />
 	</DockPanel>
 </ui:NotificationWindow>
diff --git a/source/SylphyHorn/UI/SwitchWindow.xaml b/source/SylphyHorn/UI/SwitchWindow.xaml
@@ -13,7 +13,7 @@
 					   mc:Ignorable="d"
 					   d:DataContext="{d:DesignInstance bindings:NotificationWindowViewModel}"
 					   Title="{Binding Title}"
-					   Width="500"
+					   Width="211.476"
 					   Height="100"
 					   ResizeMode="NoResize"
 					   Topmost="True"
@@ -66,14 +66,9 @@
 
 	<DockPanel VerticalAlignment="Center"
 			   Margin="16,12">
-		<TextBlock DockPanel.Dock="Top"
-				   Text="{Binding Header}"
-				   FontFamily="Segoe UI Light, Meiryo UI"
-				   FontSize="18"
-				   Margin="2,0,0,-4" />
-		<TextBlock DockPanel.Dock="Top"
+        <TextBlock DockPanel.Dock="Top"
 				   Text="{Binding Body}"
 				   FontFamily="Segoe UI Light, Meiryo UI"
-				   FontSize="32" />
+				   FontSize="32" HorizontalAlignment="Center" />
 	</DockPanel>
 </ui:NotificationWindow>