[Wpf] Track API changes, add IUtilityWindowBackend

mono · Mar 7, 2017 · 2949ae4 · 2949ae4
1 parent 7b112ac
commit 2949ae4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Xwt.WPF/Xwt.WPFBackend/WPFEngine.cs b/Xwt.WPF/Xwt.WPFBackend/WPFEngine.cs
@@ -121,7 +121,8 @@ public override void InitializeApplication ()
 			RegisterBackend<IWebViewBackend, WebViewBackend> ();
 			RegisterBackend<KeyboardHandler, WpfKeyboardHandler> ();
 			RegisterBackend<ICalendarBackend, CalendarBackend> ();
-			RegisterBackend<IPopupWindowBackend, WindowBackend> ();
+			RegisterBackend<IPopupWindowBackend, WindowBackend>();
+			RegisterBackend<IUtilityWindowBackend, WindowBackend>();
 		}
 
 		public override void DispatchPendingEvents()

diff --git a/Xwt.WPF/Xwt.WPFBackend/WindowBackend.cs b/Xwt.WPF/Xwt.WPFBackend/WindowBackend.cs
@@ -38,7 +38,7 @@
 
 namespace Xwt.WPFBackend
 {
-	public class WindowBackend : WindowFrameBackend, IWindowBackend, IPopupWindowBackend
+	public class WindowBackend : WindowFrameBackend, IWindowBackend, IPopupWindowBackend, IUtilityWindowBackend
 	{
 		protected Grid rootPanel;
 		public System.Windows.Controls.Menu mainMenu;
@@ -69,13 +69,16 @@ public override void Initialize ()
 		{
 			base.Initialize ();
 			Window.Frontend = (Window) Frontend;
+			if (Frontend is UtilityWindow)
+				defaultWindowStyle = WindowStyle.ToolWindow;
+			Decorated = true;
 		}
 
 		public void Initialize(IWindowFrameEventSink sink, PopupWindow.PopupType type)
 		{
 			Initialize ();
 			defaultWindowStyle = WindowStyle.ToolWindow;
-			Decorated = type == PopupWindow.PopupType.Utility;
+			Decorated = false;
 		}
 
 		// A Grid with a single column, and two rows (menu and child control).