Merge pull request #5 from SuperJMN/title-for-window

Title property for Window
AvaloniaUI · Nov 30, 2014 · d6fd795 · d6fd795
2 parents 6644676 + 5f1b961
commit d6fd795
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
@@ -101,6 +101,7 @@ static void Main(string[] args)
 
             Window window = new Window
             {
+                Title = "Perspex Test Application",
                 Content = new Grid
                 {
                     RowDefinitions = new RowDefinitions

diff --git a/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs b/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
@@ -444,6 +444,9 @@ public static extern IntPtr CreateWindowEx(
            IntPtr hInstance,
            IntPtr lpParam);
 
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        public static extern bool SetWindowText(IntPtr hwnd, String lpString);
+
         public struct MSG
         {
             public IntPtr hwnd;
@@ -483,6 +486,6 @@ public struct WNDCLASSEX
             public string lpszMenuName;
             public string lpszClassName;
             public IntPtr hIconSm;
-        }
+        }      
     }
 }
diff --git a/Windows/Perspex.Win32/Window.cs b/Windows/Perspex.Win32/Window.cs
@@ -27,6 +27,8 @@ namespace Perspex.Win32
 
     public class Window : ContentControl, ILayoutRoot, IRenderRoot, ICloseable
     {
+        public static readonly PerspexProperty<string> TitleProperty = PerspexProperty.Register<Window, string>("Title");
+
         private UnmanagedMethods.WndProc wndProcDelegate;
 
         private string className;
@@ -49,7 +51,7 @@ public Window()
 
             this.LayoutManager.LayoutNeeded.Subscribe(x => 
             {
-                WindowsDispatcher.CurrentDispatcher.BeginInvoke(
+                Dispatcher.CurrentDispatcher.BeginInvoke(
                     DispatcherPriority.Render, 
                     () =>
                     {
@@ -59,11 +61,13 @@ public Window()
                     });
             });
 
+            this.GetObservable(TitleProperty).Subscribe(s => UnmanagedMethods.SetWindowText(Handle, s));
+
             this.RenderManager.RenderNeeded
                 .Where(_ => !this.LayoutManager.LayoutQueued)
                 .Subscribe(x =>
             {
-                WindowsDispatcher.CurrentDispatcher.BeginInvoke(
+                Dispatcher.CurrentDispatcher.BeginInvoke(
                     DispatcherPriority.Render,
                     () =>
                     {
@@ -80,6 +84,12 @@ public Window()
 
         public event EventHandler Closed;
 
+        public string Title
+        {
+            get { return this.GetValue(TitleProperty); }
+            set { this.SetValue(TitleProperty, value); }
+        }
+
         public Size ClientSize
         {
             get