Merge branch 'fix-pointerleave-not-always-set' of https://github.com/ahopper/Avalonia into fix-pointerleave-not-always-set

.ncrunch/Avalonia.Native.v3.ncrunchproject

@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+  </Settings>
+</ProjectConfiguration>

native/Avalonia.Native/inc/avalonia-native.h

@@ -213,7 +213,7 @@ AVNCOM(IAvnPopup, 03) : virtual IAvnWindowBase
 
 AVNCOM(IAvnWindow, 04) : virtual IAvnWindowBase
 {
-    virtual HRESULT ShowDialog (IUnknown**ppv) = 0;
+    virtual HRESULT ShowDialog (IAvnWindow* parent) = 0;
     virtual HRESULT SetCanResize(bool value) = 0;
     virtual HRESULT SetHasDecorations(bool value) = 0;
     virtual HRESULT SetTitle (void* utf8Title) = 0;

native/Avalonia.Native/src/OSX/common.h

@@ -31,4 +31,13 @@ extern NSSize ToNSSize (AvnSize s);
 #define NSDebugLog(...) (void)0
 #endif
 
+template<typename T> inline T* objc_cast(id from) {
+    if(from == nil)
+        return nil;
+    if ([from isKindOfClass:[T class]]) {
+        return static_cast<T*>(from);
+    }
+    return nil;
+}
+
 #endif

native/Avalonia.Native/src/OSX/main.mm

@@ -32,27 +32,23 @@ public:
 - (void) do;
 @end
 @implementation ThreadingInitializer
-
+{
-pthread_mutex_t mutex;
+    int _fds[2];
-pthread_cond_t cond;
+}
-
 - (void) runOnce
 {
-    pthread_mutex_lock(&mutex);
+    char buf[]={0};
-    pthread_cond_signal(&cond);
+    write(_fds[1], buf, 1);
-    pthread_mutex_unlock(&mutex);
 }
 
 - (void) do
 {
-    pthread_mutex_init(&mutex, NULL);
+    pipe(_fds);
-    pthread_cond_init(&cond, NULL);
     [[[NSThread alloc] initWithTarget:self selector:@selector(runOnce) object:nil] start];
-    pthread_mutex_lock(&mutex);
+    char buf[1];
-    pthread_cond_wait(&cond, &mutex);
+    read(_fds[0], buf, 1);
-    pthread_mutex_unlock(&mutex);
+    close(_fds[0]);
-    pthread_cond_destroy(&cond);
+    close(_fds[1]);
-    pthread_mutex_destroy(&mutex);
 }
 
 

native/Avalonia.Native/src/OSX/window.h

@@ -18,6 +18,8 @@ class WindowBaseImpl;
 -(AvnWindow* _Nonnull) initWithParent: (WindowBaseImpl* _Nonnull) parent;
 -(void) setCanBecomeKeyAndMain;
 -(void) pollModalSession: (NSModalSession _Nonnull) session;
+-(void) restoreParentWindow;
+-(bool) shouldTryToHandleEvents;
 @end
 
 struct INSWindowHolder

native/Avalonia.Native/src/OSX/window.mm

@@ -109,6 +109,7 @@ public:
             if(Window != nullptr)
             {
                 [Window orderOut:Window];
+                [Window restoreParentWindow];
             }
             
             return S_OK;
@@ -392,30 +393,6 @@ protected:
     }
 };
 
-class ModalDisposable : public ComUnknownObject
-{
-    NSModalSession _session;
-    AvnWindow* _window;
-    
-    void Dispose ()
-    {
-        [_window orderOut:_window];
-        [NSApp endModalSession:_session];
-    }
-    
-public:
-    ModalDisposable(AvnWindow* window, NSModalSession session)
-    {
-        _session = session;
-        _window = window;
-    }
-    
-    virtual ~ModalDisposable()
-    {
-        Dispose();
-    }
-};
-
 class WindowImpl : public virtual WindowBaseImpl, public virtual IAvnWindow, public IWindowStateChanged
 {
 private:
@@ -444,32 +421,27 @@ private:
     {
         @autoreleasepool
         {
+            if([Window parentWindow] != nil)
+                [[Window parentWindow] removeChildWindow:Window];
             WindowBaseImpl::Show();
             
             return SetWindowState(_lastWindowState);
         }
     }
     
-    virtual HRESULT ShowDialog (IUnknown**ppv) override
+    virtual HRESULT ShowDialog (IAvnWindow* parent) override
     {
         @autoreleasepool
         {
-            if(ppv == nullptr)
+            if(parent == nullptr)
-            {
                 return E_POINTER;
-            }
-            
-            auto session = [NSApp beginModalSessionForWindow:Window];
-            auto disposable = new ModalDisposable(Window, session);
-            *ppv = disposable;
 
-            SetPosition(lastPositionSet);
+            auto cparent = dynamic_cast<WindowImpl*>(parent);
-            UpdateStyle();
+            if(cparent == nullptr)
-            
+                return E_INVALIDARG;
-            [Window setTitle:_lastTitle];
-            [Window setTitleVisibility:NSWindowTitleVisible];
             
-            [Window pollModalSession:session];
+            [cparent->Window addChildWindow:Window ordered:NSWindowAbove];
+            WindowBaseImpl::Show();
             
             return S_OK;
         }
@@ -843,8 +815,19 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     [super viewDidChangeBackingProperties];
 }
 
+- (bool) ignoreUserInput
+{
+    auto parentWindow = objc_cast<AvnWindow>([self window]);
+    if(parentWindow == nil || ![parentWindow shouldTryToHandleEvents])
+        return TRUE;
+    return FALSE;
+}
+
 - (void)mouseEvent:(NSEvent *)event withType:(AvnRawMouseEventType) type
 {
+    if([self ignoreUserInput])
+        return;
+    
     [self becomeFirstResponder];
     auto localPoint = [self convertPoint:[event locationInWindow] toView:self];
     auto avnPoint = [self toAvnPoint:localPoint];
@@ -953,6 +936,8 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
 
 - (void) keyboardEvent: (NSEvent *) event withType: (AvnRawKeyEventType)type
 {
+    if([self ignoreUserInput])
+        return;
     auto key = s_KeyMap[[event keyCode]];
     
     auto timestamp = [event timestamp] * 1000;
@@ -1125,13 +1110,15 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     {
         ComPtr<WindowBaseImpl> parent = _parent;
         _parent = NULL;
+        [self restoreParentWindow];
         parent->BaseEvents->Closed();
         [parent->View onClosed];
-        [self setContentView: nil];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self setContentView: nil];
+        });
     }
 }
 
-
 -(BOOL)canBecomeKeyWindow
 {
     return _canBecomeKeyAndMain;
@@ -1142,12 +1129,62 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     return _canBecomeKeyAndMain;
 }
 
+-(bool) activateAppropriateChild: (bool)activating
+{
+    for(NSWindow* uch in [self childWindows])
+    {
+        auto ch = objc_cast<AvnWindow>(uch);
+        if(ch == nil)
+            continue;
+        [ch activateAppropriateChild:false];
+        return FALSE;
+    }
+    
+    if(!activating)
+        [self makeKeyAndOrderFront:self];
+    return TRUE;
+}
+
+-(bool)shouldTryToHandleEvents
+{
+    for(NSWindow* uch in [self childWindows])
+    {
+        auto ch = objc_cast<AvnWindow>(uch);
+        if(ch == nil)
+            continue;
+        return FALSE;
+    }
+    return TRUE;
+}
+
+-(void)makeKeyWindow
+{
+    if([self activateAppropriateChild: true])
+    {
+        [super makeKeyWindow];
+    }
+}
+
 -(void)becomeKeyWindow
 {
-    _parent->BaseEvents->Activated();
+    if([self activateAppropriateChild: true])
-    [super becomeKeyWindow];
+    {
+        _parent->BaseEvents->Activated();
+        [super becomeKeyWindow];
+    }
 }
 
+-(void) restoreParentWindow;
+{
+    auto parent = objc_cast<AvnWindow>([self parentWindow]);
+    if(parent != nil)
+    {
+        [parent removeChildWindow:self];
+        [parent activateAppropriateChild: false];
+    }
+}
+
+
 - (BOOL)windowShouldZoom:(NSWindow *)window toFrame:(NSRect)newFrame
 {
     return true;

samples/ControlCatalog.Desktop/Program.cs

@@ -22,7 +22,7 @@ namespace ControlCatalog
         /// This method is needed for IDE previewer infrastructure
         /// </summary>
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>().LogToDebug().UsePlatformDetect();
+            => AppBuilder.Configure<App>().LogToDebug().UsePlatformDetect().UseReactiveUI();
 
         private static void ConfigureAssetAssembly(AppBuilder builder)
         {

samples/ControlCatalog/MainView.xaml

@@ -1,33 +1,41 @@
 <UserControl xmlns="https://github.com/avaloniaui"
         xmlns:pages="clr-namespace:ControlCatalog.Pages"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  <TabControl Classes="sidebar" Name="Sidebar">
+        Background="{DynamicResource ThemeBackgroundBrush}"
-    <TabControl.PageTransition>
+        Foreground="{DynamicResource ThemeForegroundBrush}"
-      <CrossFade Duration="0.25"/>
+        FontSize="{DynamicResource FontSizeNormal}">
-    </TabControl.PageTransition>
+  <Grid>
-    <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
+    <DropDown x:Name="Themes" SelectedIndex="0" Width="100" Margin="8" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-    <TabItem Header="Border"><pages:BorderPage/></TabItem>
+      <DropDownItem>Light</DropDownItem>
-    <TabItem Header="Button"><pages:ButtonPage/></TabItem>
+      <DropDownItem>Dark</DropDownItem>
-    <TabItem Header="ButtonSpinner"><pages:ButtonSpinnerPage/></TabItem>
+    </DropDown>
-    <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
+    <TabControl Classes="sidebar" Name="Sidebar">
-    <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
+      <TabItem Header="AutoCompleteBox"><pages:AutoCompleteBoxPage/></TabItem>
-    <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
+      <TabItem Header="Border"><pages:BorderPage/></TabItem>
-    <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
+      <TabItem Header="Button"><pages:ButtonPage/></TabItem>
-    <TabItem Header="ContextMenu"><pages:ContextMenuPage/></TabItem>
+      <TabItem Header="ButtonSpinner"><pages:ButtonSpinnerPage/></TabItem>
-    <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
+      <TabItem Header="Calendar"><pages:CalendarPage/></TabItem>
-    <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
+      <TabItem Header="Canvas"><pages:CanvasPage/></TabItem>
-    <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
+      <TabItem Header="Carousel"><pages:CarouselPage/></TabItem>
-    <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
+      <TabItem Header="CheckBox"><pages:CheckBoxPage/></TabItem>
-    <TabItem Header="Image"><pages:ImagePage/></TabItem>
+      <TabItem Header="ContextMenu"><pages:ContextMenuPage/></TabItem>
-    <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
+      <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
-    <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
+      <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
-    <TabItem Header="Menu"><pages:MenuPage/></TabItem>
+      <TabItem Header="DropDown"><pages:DropDownPage/></TabItem>
-	<TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
+      <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
-    <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
+      <TabItem Header="Image"><pages:ImagePage/></TabItem>
-    <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
+      <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
-    <TabItem Header="Slider"><pages:SliderPage/></TabItem>
+      <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
-    <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
+      <TabItem Header="Menu"><pages:MenuPage/></TabItem>
-    <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
+	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
-    <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
+      <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
-  </TabControl>
+      <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
+      <TabItem Header="Slider"><pages:SliderPage/></TabItem>
+      <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
+      <TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
+      <TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
+      <TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
+      <TabItem Header="Viewbox"><pages:ViewboxPage/></TabItem>
+    </TabControl>
+  </Grid>
 </UserControl>

samples/ControlCatalog/MainView.xaml.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Platform;
 using ControlCatalog.Pages;
 
@@ -27,6 +28,22 @@ namespace ControlCatalog
                 });
 
             }
+            var light = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default'/>");
+            var dark = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default'/>");
+            var themes = this.Find<DropDown>("Themes");
+            themes.SelectionChanged += (sender, e) =>
+            {
+                switch (themes.SelectedIndex)
+                {
+                    case 0:
+                        Styles[0] = light;
+                        break;
+                    case 1:
+                        Styles[0] = dark;
+                        break;
+                }
+            };
+            Styles.Add(light);
         }
 
         private void InitializeComponent()

samples/ControlCatalog/Pages/DialogsPage.xaml

@@ -3,10 +3,7 @@
       <Button Name="OpenFile">Open File</Button>
       <Button Name="SaveFile">Save File</Button>
       <Button Name="SelectFolder">Select Folder</Button>
-      <StackPanel Orientation="Horizontal">
-          <CheckBox Name="IsModal" IsChecked="True"/>
-          <TextBlock>Modal to window</TextBlock>
-      </StackPanel>
       <Button Name="DecoratedWindow">Decorated window</Button>
+      <Button Name="Dialog">Dialog</Button>
   </StackPanel>
 </UserControl>

samples/ControlCatalog/Pages/DialogsPage.xaml.cs

@@ -31,12 +31,18 @@ namespace ControlCatalog.Pages
                 }.ShowAsync(GetWindow());
             };
             this.FindControl<Button>("DecoratedWindow").Click += delegate
-            {
+                {
-                new DecoratedWindow().Show();
+                    new DecoratedWindow().ShowDialog(GetWindow());
-            };
+                };
+            this.FindControl<Button>("Dialog").Click += delegate
+                {
+                    new MainWindow().ShowDialog(GetWindow());
+                };
+
+
         }
 
-        Window GetWindow() => this.FindControl<CheckBox>("IsModal").IsChecked.Value ? (Window)this.VisualRoot : null;
+        Window GetWindow() => (Window)this.VisualRoot;
 
         private void InitializeComponent()
         {

samples/ControlCatalog/Pages/MenuPage.xaml.cs

@@ -83,7 +83,7 @@ namespace ControlCatalog.Pages
         public async Task Open()
         {
             var dialog = new OpenFileDialog();
-            var result = await dialog.ShowAsync();
+            var result = await dialog.ShowAsync(App.Current.MainWindow);
 
             if (result != null)
             {

samples/ControlCatalog/Pages/NumericUpDownPage.xaml

@@ -6,7 +6,7 @@
 
     <TextBlock Margin="2,5,2,2" FontSize="14" FontWeight="Bold">Features:</TextBlock>
     <Grid Margin="2" ColumnDefinitions="Auto,Auto,Auto,Auto" RowDefinitions="Auto,Auto">
-      <Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto, Auto" RowDefinitions="35,35,35,35,35">
+      <Grid Grid.Row="0" Grid.Column="0" ColumnDefinitions="Auto, Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">ShowButtonSpinner:</TextBlock>
         <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding #upDown.ShowButtonSpinner}" VerticalAlignment="Center" Margin="2"/>
 
@@ -20,7 +20,7 @@
         <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding #upDown.ClipValueToMinMax}" VerticalAlignment="Center" Margin="2"/>
 
       </Grid>
-      <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="35,35,35,35,35">
+      <Grid Grid.Row="0" Grid.Column="1" Margin="10,2,2,2" ColumnDefinitions="Auto, 120" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="2">FormatString:</TextBlock>
         <DropDown Grid.Row="0" Grid.Column="1" Items="{Binding Formats}" SelectedItem="{Binding SelectedFormat}"
                   VerticalAlignment="Center" Margin="2">
@@ -49,22 +49,22 @@
         <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="2">Text:</TextBlock>
         <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding #upDown.Text}" VerticalAlignment="Center" Margin="2" />
       </Grid>
-      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="35,35,35,35,35" ColumnDefinitions="Auto, 120">
+      <Grid Grid.Row="0" Grid.Column="2" Margin="10,2,2,2" RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto, 120">
         <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Minimum:</TextBlock>
         <NumericUpDown Grid.Row="0" Grid.Column="1" Value="{Binding #upDown.Minimum}"
-                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" Width="70" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Maximum:</TextBlock>
         <NumericUpDown Grid.Row="1" Grid.Column="1" Value="{Binding #upDown.Maximum}"
-                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+                       CultureInfo="{Binding #upDown.CultureInfo}" VerticalAlignment="Center" Margin="2" Width="70" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Increment:</TextBlock>
         <NumericUpDown Grid.Row="2" Grid.Column="1" Value="{Binding #upDown.Increment}" VerticalAlignment="Center"
-                       Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+                       Margin="2" Width="70" HorizontalAlignment="Center"/>
 
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Margin="10,2,2,2">Value:</TextBlock>
         <NumericUpDown Grid.Row="3" Grid.Column="1" Value="{Binding #upDown.Value}" VerticalAlignment="Center"
-                       Height="25" Margin="2" Width="70" HorizontalAlignment="Center"/>
+                       Margin="2" Width="70" HorizontalAlignment="Center"/>
 
       </Grid>
     </Grid>
@@ -72,7 +72,7 @@
     <StackPanel Margin="2,10,2,2" Orientation="Horizontal" Spacing="10">
       <TextBlock FontSize="14" FontWeight="Bold" VerticalAlignment="Center">Usage of NumericUpDown:</TextBlock>
       <NumericUpDown Name="upDown" Minimum="0" Maximum="10" Increment="0.5"
-                     CultureInfo="en-US" VerticalAlignment="Center" Height="25" Width="100"
+                     CultureInfo="en-US" VerticalAlignment="Center" Width="100"
                      Watermark="Enter text" FormatString="{Binding SelectedFormat.Value}"/>
     </StackPanel>
 

samples/ControlCatalog/Pages/TabControlPage.xaml

@@ -0,0 +1,124 @@
+<UserControl xmlns="https://github.com/avaloniaui">
+    <DockPanel>
+        <TextBlock 
+            DockPanel.Dock="Top" 
+            Classes="h1"
+            Text="TabControl"
+            Margin="4">           
+        </TextBlock>
+        <TextBlock 
+            DockPanel.Dock="Top" 
+            Classes="h2"
+            Text="A tab control that displays a tab strip along with the content of the selected tab"
+            Margin="4">          
+        </TextBlock>
+        <Grid 
+            ColumnDefinitions="*,*" 
+            RowDefinitions="*,100">
+            <DockPanel
+                Grid.Column="0"
+                Margin="4">
+                <TextBlock
+                    DockPanel.Dock="Top"
+                    Classes="h1"
+                    Text="From Inline TabItems">
+                </TextBlock>
+                <TabControl
+                    Margin="0 16"
+                    TabStripPlacement="{Binding TabPlacement}">
+                    <TabItem>
+                        <TabItem.Header>
+                            <TextBlock
+                               Text="Arch"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center"
+                               Margin="8">
+                            </TextBlock>
+                        </TabItem.Header>
+                        <StackPanel Orientation="Vertical" Spacing="8">
+                            <TextBlock>This is the first page in the TabControl.</TextBlock>
+                            <Image Source="resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg" Width="300"/>
+                        </StackPanel>
+                    </TabItem>
+                    <TabItem>
+                        <TabItem.Header>
+                            <TextBlock
+                               Text="Leaf"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center"
+                               Margin="8">
+                            </TextBlock>
+                        </TabItem.Header>
+                        <StackPanel Orientation="Vertical" Spacing="8">
+                            <TextBlock>This is the second page in the TabControl.</TextBlock>
+                            <Image Source="resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg" Width="300"/>
+                        </StackPanel>
+                    </TabItem>
+                    <TabItem IsEnabled="False">
+                        <TabItem.Header>
+                            <TextBlock
+                               Text="Disabled"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center"
+                               Margin="8">
+                            </TextBlock>
+                        </TabItem.Header>
+                        <TextBlock>You should not see this.</TextBlock>
+                    </TabItem>
+                </TabControl>
+            </DockPanel>
+            <DockPanel
+                Grid.Column="1"
+                Margin="4">
+                <TextBlock
+                    DockPanel.Dock="Top"
+                    Classes="h1"
+                    Text="From DataTemplate">
+                </TextBlock>
+                <TabControl
+                    Items="{Binding Tabs}"
+                    Margin="0 16"
+                    TabStripPlacement="{Binding TabPlacement}">
+                    <TabControl.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock
+                                Text="{Binding Header}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Margin="8">
+                            </TextBlock>
+                        </DataTemplate>
+                    </TabControl.ItemTemplate>
+                    <TabControl.ContentTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Vertical" Spacing="8">
+                                <TextBlock Text="{Binding Text}"/>
+                                <Image Source="{Binding Image}" Width="300"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </TabControl.ContentTemplate>
+                    <TabControl.Styles>
+                        <Style Selector="TabItem">
+                            <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
+                        </Style>
+                    </TabControl.Styles>
+                </TabControl>
+            </DockPanel>
+            <StackPanel
+                Grid.Row="1"
+                Grid.ColumnSpan="2"
+                Orientation="Horizontal"
+                Spacing="8"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+                <TextBlock VerticalAlignment="Center">Tab Placement:</TextBlock>
+                <DropDown SelectedIndex="{Binding TabPlacement, Mode=TwoWay}">
+                    <DropDownItem>Left</DropDownItem>
+                    <DropDownItem>Bottom</DropDownItem>
+                    <DropDownItem>Right</DropDownItem>
+                    <DropDownItem>Top</DropDownItem>
+                </DropDown>
+            </StackPanel>
+        </Grid>
+    </DockPanel>
+</UserControl>

samples/ControlCatalog/Pages/TabControlPage.xaml.cs

@@ -0,0 +1,80 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+using ReactiveUI;
+
+namespace ControlCatalog.Pages
+{
+    using System.Collections.Generic;
+
+    public class TabControlPage : UserControl
+    {
+        public TabControlPage()
+        {
+            InitializeComponent();
+
+            DataContext = new PageViewModel
+            {
+                Tabs = new[]
+                {
+                    new TabItemViewModel
+                    {
+                        Header = "Arch",
+                        Text = "This is the first templated tab page.",
+                        Image = LoadBitmap("resm:ControlCatalog.Assets.delicate-arch-896885_640.jpg?assembly=ControlCatalog"),
+                    },
+                    new TabItemViewModel
+                    {
+                        Header = "Leaf",
+                        Text = "This is the second templated tab page.",
+                        Image = LoadBitmap("resm:ControlCatalog.Assets.maple-leaf-888807_640.jpg?assembly=ControlCatalog"),
+                    },
+                    new TabItemViewModel
+                    {
+                        Header = "Disabled",
+                        Text = "You should not see this.",
+                        IsEnabled = false,
+                    },
+                },
+                TabPlacement = Dock.Top,
+            };
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        private IBitmap LoadBitmap(string uri)
+        {
+            var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+            return new Bitmap(assets.Open(new Uri(uri)));
+        }
+
+        private class PageViewModel : ReactiveObject
+        {
+            private Dock _tabPlacement;
+
+            public TabItemViewModel[] Tabs { get; set; }
+
+            public Dock TabPlacement
+            {
+                get { return _tabPlacement; }
+                set { this.RaiseAndSetIfChanged(ref _tabPlacement, value); }
+            }
+        }
+
+        private class TabItemViewModel
+        {
+            public string Header { get; set; }
+            public string Text { get; set; }
+            public IBitmap Image { get; set; }
+            public bool IsEnabled { get; set; } = true;           
+        }
+    }
+}

samples/ControlCatalog/Pages/ViewboxPage.xaml

@@ -0,0 +1,65 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <UserControl.Resources>
+        <StreamGeometry x:Key="Acorn">
+            F1 M 16.6309,18.6563C 17.1309,
+            8.15625 29.8809,14.1563 29.8809,
+            14.1563C 30.8809,11.1563 34.1308,
+            11.4063 34.1308,11.4063C 33.5,12
+            34.6309,13.1563 34.6309,13.1563C
+            32.1309,13.1562 31.1309,14.9062
+            31.1309,14.9062C 41.1309,23.9062
+            32.6309,27.9063 32.6309,27.9062C
+            24.6309,24.9063 21.1309,22.1562
+            16.6309,18.6563 Z M 16.6309,19.9063C
+            21.6309,24.1563 25.1309,26.1562
+            31.6309,28.6562C 31.6309,28.6562
+            26.3809,39.1562 18.3809,36.1563C
+            18.3809,36.1563 18,38 16.3809,36.9063C
+            15,36 16.3809,34.9063 16.3809,34.9063C
+            16.3809,34.9063 10.1309,30.9062 16.6309,19.9063 Z
+        </StreamGeometry>
+    </UserControl.Resources>
+
+    <Grid RowDefinitions="Auto,*">
+        <StackPanel Orientation="Vertical" Spacing="4">
+            <TextBlock Classes="h1">Viewbox</TextBlock>
+            <TextBlock Classes="h2">A control used to scale single child.</TextBlock>
+        </StackPanel>
+        <Grid ColumnDefinitions="Auto,*,*"
+              RowDefinitions="*,*,*,*"
+              Grid.Row="1" Margin="48"
+              MaxWidth="400">
+            <TextBlock Grid.Row="0" VerticalAlignment="Center">None</TextBlock>
+            <TextBlock Grid.Row="1" VerticalAlignment="Center">Fill</TextBlock>
+            <TextBlock Grid.Row="2" VerticalAlignment="Center">Uniform</TextBlock>
+            <TextBlock Grid.Row="3" VerticalAlignment="Center">UniformToFill</TextBlock>
+
+            <Viewbox Grid.Row="0" Grid.Column="1" Stretch="None">
+                <TextBlock>Hello World!</TextBlock>
+            </Viewbox>
+            <Viewbox Grid.Row="1" Grid.Column="1" Stretch="Fill">
+                <TextBlock>Hello World!</TextBlock>
+            </Viewbox>
+            <Viewbox Grid.Row="2" Grid.Column="1" Stretch="Uniform">
+                <TextBlock>Hello World!</TextBlock>
+            </Viewbox>
+            <Viewbox Grid.Row="3" Grid.Column="1" Stretch="UniformToFill">
+                <TextBlock>Hello World!</TextBlock>
+            </Viewbox>
+
+            <Viewbox Grid.Row="0" Grid.Column="2" Stretch="None">
+                <Path Fill="Blue" Data="{StaticResource Acorn}"/>
+            </Viewbox>
+            <Viewbox Grid.Row="1" Grid.Column="2" Stretch="Fill">
+                <Path Fill="Blue" Data="{StaticResource Acorn}"/>
+            </Viewbox>
+            <Viewbox Grid.Row="2" Grid.Column="2" Stretch="Uniform">
+                <Path Fill="Blue" Data="{StaticResource Acorn}"/>
+            </Viewbox>
+            <Viewbox Grid.Row="3" Grid.Column="2" Stretch="UniformToFill">
+                <Path Fill="Blue" Data="{StaticResource Acorn}"/>
+            </Viewbox>
+        </Grid>
+    </Grid>
+</UserControl>

samples/ControlCatalog/Pages/ViewboxPage.xaml.cs

@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public class ViewboxPage : UserControl
+    {
+        public ViewboxPage()
+        {
+            this.InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

samples/ControlCatalog/SideBar.xaml

@@ -1,52 +1,67 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
-  <Style Selector="TabControl.sidebar">
+    <Style Selector="TabControl.sidebar">
-    <Setter Property="Template">
+        <Setter Property="TabStripPlacement" Value="Left"/>
-      <ControlTemplate>
+        <Setter Property="Padding" Value="8 0 0 0"/>
-        <DockPanel>
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush}"/>
-          <ScrollViewer MinWidth="190" Background="{DynamicResource ThemeAccentBrush}" DockPanel.Dock="Left">
+        <Setter Property="Template">
-            <TabStrip Name="PART_TabStrip"
+            <ControlTemplate>
-                      MemberSelector="{x:Static TabControl.HeaderSelector}"
+                <Border 
-                      Items="{TemplateBinding Items}"
+                    Margin="{TemplateBinding Margin}"
-                      SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}">
+                    BorderBrush="{TemplateBinding BorderBrush}"
-              <TabStrip.ItemsPanel>
+                    BorderThickness="{TemplateBinding BorderThickness}">
-                <ItemsPanelTemplate>
+                    <DockPanel>
-                  <StackPanel Orientation="Vertical"/>
+                        <ScrollViewer
-                </ItemsPanelTemplate>
+                            Name="PART_ScrollViewer"
-              </TabStrip.ItemsPanel>
+                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-            </TabStrip>
+                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
-          </ScrollViewer>
+                            Background="{TemplateBinding Background}">
-          <Carousel Name="PART_Content"
+                            <ItemsPresenter
-                    Margin="8 0 0 0"
+                                Name="PART_ItemsPresenter"
-                    MemberSelector="{x:Static TabControl.ContentSelector}"
+                                MinWidth="190"                            
-                    Items="{TemplateBinding Items}"
+                                Items="{TemplateBinding Items}"
-                    SelectedIndex="{TemplateBinding SelectedIndex}"
+                                ItemsPanel="{TemplateBinding ItemsPanel}"
-                    PageTransition="{TemplateBinding PageTransition}"
+                                ItemTemplate="{TemplateBinding ItemTemplate}"
-                    Grid.Row="1"/>
+                                MemberSelector="{TemplateBinding MemberSelector}">
-        </DockPanel>
+                            </ItemsPresenter>
-      </ControlTemplate>
+                        </ScrollViewer>
-    </Setter>
+                        <ContentPresenter
-  </Style>
+                            Name="PART_Content"
+                            Margin="{TemplateBinding Padding}"                           
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding SelectedContent}"
+                            ContentTemplate="{TemplateBinding SelectedContentTemplate}">
+                        </ContentPresenter>
+                    </DockPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
 
-  <Style Selector="TabControl.sidebar TabStripItem">
+    <Style Selector="TabControl.sidebar > TabItem">       
-    <Setter Property="Foreground" Value="White"/>
+        <Setter Property="BorderThickness" Value="0"/>
-    <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="White"/>
-    <Setter Property="Margin" Value="0"/>
+        <Setter Property="FontSize" Value="14"/>
-    <Setter Property="Padding" Value="16"/>
+        <Setter Property="Margin" Value="0"/>
-    <Setter Property="Opacity" Value="0.5"/>
+        <Setter Property="Padding" Value="16"/>
-    <Setter Property="Transitions">
+        <Setter Property="Opacity" Value="0.5"/>
-      <Transitions>
+        <Setter Property="Transitions">
-        <DoubleTransition Property="Opacity" Duration="0:0:0.2"/>
+            <Transitions>
-      </Transitions>
+                <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
-    </Setter>
+            </Transitions>
-  </Style>
+        </Setter>
-
+    </Style>
-  <Style Selector="TabControl.sidebar TabStripItem:pointerover">
+    <Style Selector="TabControl.sidebar > TabItem:pointerover">
-    <Setter Property="Opacity" Value="1"/>
+        <Setter Property="Opacity" Value="1"/>
-  </Style>
+    </Style>
-
+    <Style Selector="TabControl.sidebar > TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-  <Style Selector="TabControl.sidebar TabStripItem:selected">
+        <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
+    </Style>
-    <Setter Property="Opacity" Value="1"/>
+    <Style Selector="TabControl.sidebar > TabItem:selected">
-  </Style>
+        <Setter Property="Opacity" Value="1"/>
+    </Style>
+    <Style Selector="TabControl.sidebar > TabItem:selected /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
+    </Style>
 </Styles>

scripts/ReplaceNugetCache.sh

@@ -4,5 +4,6 @@
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.gtk3/$1/lib/netstandard2.0/
  cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.skia/$1/lib/netstandard2.0/
+ cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.native/$1/lib/netstandard2.0/
  
  

src/Avalonia.Base/Data/Core/ExpressionNode.cs

@@ -88,18 +88,21 @@ namespace Avalonia.Data.Core
             _subscriber(value);
         }
 
-        protected void ValueChanged(object value)
+        protected void ValueChanged(object value) => ValueChanged(value, true);
+
+        private void ValueChanged(object value, bool notify)
         {
             var notification = value as BindingNotification;
 
             if (notification == null)
             {
                 LastValue = new WeakReference(value);
+
                 if (Next != null)
                 {
-                    Next.Target = new WeakReference(value);
+                    Next.Target = LastValue;
                 }
-                else
+                else if (notify)
                 {
                     _subscriber(value);
                 }
@@ -110,7 +113,7 @@ namespace Avalonia.Data.Core
 
                 if (Next != null)
                 {
-                    Next.Target = new WeakReference(notification.Value);
+                    Next.Target = LastValue;
                 }
 
                 if (Next == null || notification.Error != null)
@@ -136,6 +139,7 @@ namespace Avalonia.Data.Core
             }
             else
             {
+                ValueChanged(AvaloniaProperty.UnsetValue, notify:false);
                 _listening = false;
             }
         }

src/Avalonia.Controls/Generators/TabItemContainerGenerator.cs

@@ -0,0 +1,57 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Controls.Primitives;
+
+namespace Avalonia.Controls.Generators
+{    
+    public class TabItemContainerGenerator : ItemContainerGenerator<TabItem>
+    {
+        public TabItemContainerGenerator(TabControl owner)
+            : base(owner, ContentControl.ContentProperty, ContentControl.ContentTemplateProperty)
+        {
+            Owner = owner;
+        }
+
+        public new TabControl Owner { get; }
+
+        protected override IControl CreateContainer(object item)
+        {
+            var tabItem = (TabItem)base.CreateContainer(item);
+
+            tabItem.ParentTabControl = Owner;
+
+            if (tabItem.HeaderTemplate == null)
+            {
+                tabItem[~HeaderedContentControl.HeaderTemplateProperty] = Owner[~ItemsControl.ItemTemplateProperty];
+            }
+
+            if (tabItem.Header == null)
+            {
+                if (item is IHeadered headered)
+                {
+                    tabItem.Header = headered.Header;
+                }
+                else
+                {
+                    if (!(tabItem.DataContext is IControl))
+                    {
+                        tabItem.Header = tabItem.DataContext;
+                    }
+                }
+            }
+
+            if (!(tabItem.Content is IControl))
+            {
+                tabItem[~ContentControl.ContentTemplateProperty] = Owner[~TabControl.ContentTemplateProperty];
+            }
+
+            if (tabItem.Content == null)
+            {
+                tabItem[~ContentControl.ContentProperty] = tabItem[~StyledElement.DataContextProperty];
+            }
+
+            return tabItem;
+        }
+    }
+}

src/Avalonia.Controls/ItemsControl.cs

@@ -249,8 +249,6 @@ namespace Avalonia.Controls
                         if (containerControl != null)
                         {
                             ((ISetLogicalParent)containerControl).SetParent(this);
-                            containerControl.SetValue(TemplatedParentProperty, null);
-
                             containerControl.UpdateChild();
 
                             if (containerControl.Child != null)

src/Avalonia.Controls/LayoutTransformControl.cs

@@ -5,28 +5,30 @@
 // http://silverlight.codeplex.com/SourceControl/changeset/view/74775#Release/Silverlight4/Source/Controls.Layout.Toolkit/LayoutTransformer/LayoutTransformer.cs
 //
 
-using Avalonia.Controls.Primitives;
-using Avalonia.Media;
-using Avalonia.VisualTree;
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Reactive.Linq;
+using Avalonia.Media;
 
 namespace Avalonia.Controls
 {
     /// <summary>
     /// Control that implements support for transformations as if applied by LayoutTransform.
     /// </summary>
-    public class LayoutTransformControl : ContentControl
+    public class LayoutTransformControl : Decorator
     {
         public static readonly AvaloniaProperty<Transform> LayoutTransformProperty =
             AvaloniaProperty.Register<LayoutTransformControl, Transform>(nameof(LayoutTransform));
 
         static LayoutTransformControl()
         {
+            ClipToBoundsProperty.OverrideDefaultValue<LayoutTransformControl>(true);
+
             LayoutTransformProperty.Changed
                 .AddClassHandler<LayoutTransformControl>(x => x.OnLayoutTransformChanged);
+
+            ChildProperty.Changed
+                .AddClassHandler<LayoutTransformControl>(x => x.OnChildChanged);
         }
 
         /// <summary>
@@ -38,8 +40,7 @@ namespace Avalonia.Controls
             set { SetValue(LayoutTransformProperty, value); }
         }
 
-        public Control TransformRoot => _transformRoot ??
+        public IControl TransformRoot => Child;
-                            (_transformRoot = this.GetVisualChildren().OfType<Control>().FirstOrDefault());
 
         /// <summary>
         /// Provides the behavior for the "Arrange" pass of layout.
@@ -132,16 +133,8 @@ namespace Avalonia.Controls
             return transformedDesiredSize;
         }
 
-        /// <summary>
+        private void OnChildChanged(AvaloniaPropertyChangedEventArgs e)
-        /// Builds the visual tree for the LayoutTransformerControl when a new
-        /// template is applied.
-        /// </summary>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
-
-            _matrixTransform = new MatrixTransform();
-
             if (null != TransformRoot)
             {
                 TransformRoot.RenderTransform = _matrixTransform;
@@ -169,14 +162,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// RenderTransform/MatrixTransform applied to TransformRoot.
         /// </summary>
-        private MatrixTransform _matrixTransform;
+        private MatrixTransform _matrixTransform = new MatrixTransform();
 
         /// <summary>
         /// Transformation matrix corresponding to _matrixTransform.
         /// </summary>
         private Matrix _transformation;
         private IDisposable _transformChangedEvent = null;
-        private Control _transformRoot;
+
         /// <summary>
         /// Returns true if Size a is smaller than Size b in either dimension.
         /// </summary>
@@ -215,7 +208,8 @@ namespace Avalonia.Controls
         /// </remarks>
         private void ApplyLayoutTransform()
         {
-            if (LayoutTransform == null) return;
+            if (LayoutTransform == null)
+                return;
 
             // Get the transform matrix and apply it
             _transformation = RoundMatrix(LayoutTransform.Value, DecimalsAfterRound);
@@ -376,11 +370,8 @@ namespace Avalonia.Controls
         {
             var newTransform = e.NewValue as Transform;
 
-            if (_transformChangedEvent != null)
+            _transformChangedEvent?.Dispose();
-            {
+            _transformChangedEvent = null;
-                _transformChangedEvent.Dispose();
-                _transformChangedEvent = null;
-            }
 
             if (newTransform != null)
             {

src/Avalonia.Controls/Platform/IWindowImpl.cs

@@ -30,10 +30,7 @@ namespace Avalonia.Platform
         /// <summary>
         /// Shows the window as a dialog.
         /// </summary>
-        /// <returns>
+        void ShowDialog(IWindowImpl parent);
-        /// An <see cref="IDisposable"/> that should be used to close the window.
-        /// </returns>
-        IDisposable ShowDialog();
 
         /// <summary>
         /// Enables or disables system window decorations (title bar, buttons, etc)

src/Avalonia.Controls/Primitives/HeaderedContentControl.cs

@@ -1,6 +1,8 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using Avalonia.Controls.Templates;
+
 namespace Avalonia.Controls.Primitives
 {
     /// <summary>
@@ -12,7 +14,13 @@ namespace Avalonia.Controls.Primitives
         /// Defines the <see cref="Header"/> property.
         /// </summary>
         public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<ContentControl, object>(nameof(Header));
+            AvaloniaProperty.Register<HeaderedContentControl, object>(nameof(Header));
+
+        /// <summary>
+        /// Defines the <see cref="HeaderTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
+            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate>(nameof(HeaderTemplate));          
 
         /// <summary>
         /// Gets or sets the header content.
@@ -22,5 +30,14 @@ namespace Avalonia.Controls.Primitives
             get { return GetValue(HeaderProperty); }
             set { SetValue(HeaderProperty, value); }
         }     
+
+        /// <summary>
+        /// Gets or sets the data template used to display the header content of the control.
+        /// </summary>
+        public IDataTemplate HeaderTemplate
+        {
+            get { return GetValue(HeaderTemplateProperty); }
+            set { SetValue(HeaderTemplateProperty, value); }
+        }
     }
 }

src/Avalonia.Controls/Primitives/PopupRoot.cs

@@ -84,8 +84,10 @@ namespace Avalonia.Controls.Primitives
 
             if (screen != null)
             {
-                var screenX = Position.X + Bounds.Width - screen.Bounds.X;
+                var scaling = VisualRoot.RenderScaling;
-                var screenY = Position.Y + Bounds.Height - screen.Bounds.Y;
+
+                var screenX = Position.X + (Bounds.Width * scaling) - screen.Bounds.X;
+                var screenY = Position.Y + (Bounds.Height * scaling) - screen.Bounds.Y;
 
                 if (screenX > screen.Bounds.Width)
                 {

src/Avalonia.Controls/Primitives/TemplatedControl.cs

@@ -260,7 +260,7 @@ namespace Avalonia.Controls.Primitives
                     var child = template.Build(this);
                     var nameScope = new NameScope();
                     NameScope.SetNameScope((Control)child, nameScope);
-                    child.SetValue(TemplatedParentProperty, this);
+                    ApplyTemplatedParent(child);
                     RegisterNames(child, nameScope);
                     ((ISetLogicalParent)child).SetParent(this);
                     VisualChildren.Add(child);
@@ -326,6 +326,23 @@ namespace Avalonia.Controls.Primitives
             InvalidateMeasure();
         }
 
+        /// <summary>
+        /// Sets the TemplatedParent property for the created template children.
+        /// </summary>
+        /// <param name="control">The control.</param>
+        private void ApplyTemplatedParent(IControl control)
+        {
+            control.SetValue(TemplatedParentProperty, this);
+
+            foreach (var child in control.LogicalChildren)
+            {
+                if (child is IControl c)
+                {
+                    ApplyTemplatedParent(c);
+                }
+            }
+        }
+
         /// <summary>
         /// Registers each control with its name scope.
         /// </summary>

src/Avalonia.Controls/SystemDialog.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -20,26 +21,38 @@ namespace Avalonia.Controls
     {
         public string DefaultExtension { get; set; }
 
-        public async Task<string> ShowAsync(Window window)
+        public async Task<string> ShowAsync(Window parent)
-            =>
+        {
-                ((await AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFileDialogAsync(this, window?.PlatformImpl)) ??
+            if(parent == null)
-                 new string[0]).FirstOrDefault();
+                throw new ArgumentNullException(nameof(parent));
+            return ((await AvaloniaLocator.Current.GetService<ISystemDialogImpl>()
+                 .ShowFileDialogAsync(this, parent?.PlatformImpl)) ??
+             new string[0]).FirstOrDefault();
+        }
     }
 
     public class OpenFileDialog : FileDialog
     {
         public bool AllowMultiple { get; set; }
 
-        public Task<string[]> ShowAsync(Window window = null)
+        public Task<string[]> ShowAsync(Window parent)
-            => AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFileDialogAsync(this, window?.PlatformImpl);
+        {
+            if(parent == null)
+                throw new ArgumentNullException(nameof(parent));
+            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFileDialogAsync(this, parent?.PlatformImpl);
+        }
     }
 
     public class OpenFolderDialog : FileSystemDialog
     {
         public string DefaultDirectory { get; set; }
 
-        public Task<string> ShowAsync(Window window = null)
+        public Task<string> ShowAsync(Window parent)
-               => AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFolderDialogAsync(this, window?.PlatformImpl);
+        {
+            if(parent == null)
+                throw new ArgumentNullException(nameof(parent));
+            return AvaloniaLocator.Current.GetService<ISystemDialogImpl>().ShowFolderDialogAsync(this, parent?.PlatformImpl);
+        }
     }
 
     public abstract class SystemDialog

src/Avalonia.Controls/TabControl.cs

@@ -1,10 +1,12 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Animation;
 using Avalonia.Controls.Generators;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Layout;
 
 namespace Avalonia.Controls
 {
@@ -14,28 +16,46 @@ namespace Avalonia.Controls
     public class TabControl : SelectingItemsControl
     {
         /// <summary>
-        /// Defines the <see cref="PageTransition"/> property.
+        /// Defines the <see cref="TabStripPlacement"/> property.
         /// </summary>
-        public static readonly StyledProperty<IPageTransition> PageTransitionProperty =
+        public static readonly StyledProperty<Dock> TabStripPlacementProperty =
-            Avalonia.Controls.Carousel.PageTransitionProperty.AddOwner<TabControl>();
+            AvaloniaProperty.Register<TabControl, Dock>(nameof(TabStripPlacement), defaultValue: Dock.Top);
 
         /// <summary>
-        /// Defines an <see cref="IMemberSelector"/> that selects the content of a <see cref="TabItem"/>.
+        /// Defines the <see cref="HorizontalContentAlignment"/> property.
         /// </summary>
-        public static readonly IMemberSelector ContentSelector =
+        public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
-            new FuncMemberSelector<object, object>(SelectContent);
+            ContentControl.HorizontalContentAlignmentProperty.AddOwner<TabControl>();
 
         /// <summary>
-        /// Defines an <see cref="IMemberSelector"/> that selects the header of a <see cref="TabItem"/>.
+        /// Defines the <see cref="VerticalContentAlignment"/> property.
         /// </summary>
-        public static readonly IMemberSelector HeaderSelector =
+        public static readonly StyledProperty<VerticalAlignment> VerticalContentAlignmentProperty =
-            new FuncMemberSelector<object, object>(SelectHeader);
+            ContentControl.VerticalContentAlignmentProperty.AddOwner<TabControl>();
 
         /// <summary>
-        /// Defines the <see cref="TabStripPlacement"/> property.
+        /// Defines the <see cref="ContentTemplate"/> property.
         /// </summary>
-        public static readonly StyledProperty<Dock> TabStripPlacementProperty =
+        public static readonly StyledProperty<IDataTemplate> ContentTemplateProperty =
-            AvaloniaProperty.Register<TabControl, Dock>(nameof(TabStripPlacement), defaultValue: Dock.Top);
+            ContentControl.ContentTemplateProperty.AddOwner<TabControl>();
+
+        /// <summary>
+        /// The selected content property
+        /// </summary>
+        public static readonly StyledProperty<object> SelectedContentProperty =
+            AvaloniaProperty.Register<TabControl, object>(nameof(SelectedContent));
+
+        /// <summary>
+        /// The selected content template property
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate> SelectedContentTemplateProperty =
+            AvaloniaProperty.Register<TabControl, IDataTemplate>(nameof(SelectedContentTemplate));
+
+        /// <summary>
+        /// The default value for the <see cref="ItemsControl.ItemsPanel"/> property.
+        /// </summary>
+        private static readonly FuncTemplate<IPanel> DefaultPanel =
+            new FuncTemplate<IPanel>(() => new WrapPanel());
 
         /// <summary>
         /// Initializes static members of the <see cref="TabControl"/> class.
@@ -43,107 +63,107 @@ namespace Avalonia.Controls
         static TabControl()
         {
             SelectionModeProperty.OverrideDefaultValue<TabControl>(SelectionMode.AlwaysSelected);
-            FocusableProperty.OverrideDefaultValue<TabControl>(false);
+            ItemsPanelProperty.OverrideDefaultValue<TabControl>(DefaultPanel);
             AffectsMeasure<TabControl>(TabStripPlacementProperty);
         }
 
         /// <summary>
-        /// Gets the pages portion of the <see cref="TabControl"/>'s template.
+        /// Gets or sets the horizontal alignment of the content within the control.
         /// </summary>
-        public IControl Pages
+        public HorizontalAlignment HorizontalContentAlignment
         {
-            get;
+            get { return GetValue(HorizontalContentAlignmentProperty); }
-            private set;
+            set { SetValue(HorizontalContentAlignmentProperty, value); }
         }
 
         /// <summary>
-        /// Gets the tab strip portion of the <see cref="TabControl"/>'s template.
+        /// Gets or sets the vertical alignment of the content within the control.
         /// </summary>
-        public IControl TabStrip
+        public VerticalAlignment VerticalContentAlignment
         {
-            get;
+            get { return GetValue(VerticalContentAlignmentProperty); }
-            private set;
+            set { SetValue(VerticalContentAlignmentProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the transition to use when switching tabs.
+        /// Gets or sets the tabstrip placement of the TabControl.
         /// </summary>
-        public IPageTransition PageTransition
+        public Dock TabStripPlacement
         {
-            get { return GetValue(PageTransitionProperty); }
+            get { return GetValue(TabStripPlacementProperty); }
-            set { SetValue(PageTransitionProperty, value); }
+            set { SetValue(TabStripPlacementProperty, value); }
         }
 
         /// <summary>
-        /// Gets or sets the tabstrip placement of the tabcontrol.
+        /// Gets or sets the default data template used to display the content of the selected tab.
         /// </summary>
-        public Dock TabStripPlacement
+        public IDataTemplate ContentTemplate
         {
-            get { return GetValue(TabStripPlacementProperty); }
+            get { return GetValue(ContentTemplateProperty); }
-            set { SetValue(TabStripPlacementProperty, value); }
+            set { SetValue(ContentTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the content of the selected tab.
+        /// </summary>
+        /// <value>
+        /// The content of the selected tab.
+        /// </value>
+        public object SelectedContent
+        {
+            get { return GetValue(SelectedContentProperty); }
+            internal set { SetValue(SelectedContentProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the content template for the selected tab.
+        /// </summary>
+        /// <value>
+        /// The content template of the selected tab.
+        /// </value>
+        public IDataTemplate SelectedContentTemplate
+        {
+            get { return GetValue(SelectedContentTemplateProperty); }
+            internal set { SetValue(SelectedContentTemplateProperty, value); }
+        }
+
+        internal ItemsPresenter ItemsPresenterPart { get; private set; }
+
+        internal ContentPresenter ContentPart { get; private set; }
+
         protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
-            // TabControl doesn't actually create items - instead its TabStrip and Carousel
+            return new TabItemContainerGenerator(this);
-            // children create the items. However we want it to be a SelectingItemsControl
-            // so that it has the Items/SelectedItem etc properties. In this case, we can
-            // return a null ItemContainerGenerator to disable the creation of item containers.
-            return null;
         }
 
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             base.OnTemplateApplied(e);
 
-            TabStrip = e.NameScope.Find<IControl>("PART_TabStrip");
+            ItemsPresenterPart = e.NameScope.Get<ItemsPresenter>("PART_ItemsPresenter");
-            Pages = e.NameScope.Find<IControl>("PART_Content");
+
+            ContentPart = e.NameScope.Get<ContentPresenter>("PART_Content");
         }
 
-        /// <summary>
+        /// <inheritdoc/>
-        /// Selects the content of a tab item.
+        protected override void OnGotFocus(GotFocusEventArgs e)
-        /// </summary>
-        /// <param name="o">The tab item.</param>
-        /// <returns>The content.</returns>
-        private static object SelectContent(object o)
         {
-            var content = o as IContentControl;
+            base.OnGotFocus(e);
 
-            if (content != null)
+            if (e.NavigationMethod == NavigationMethod.Directional)
             {
-                return content.Content;
+                e.Handled = UpdateSelectionFromEventSource(e.Source);
-            }
-            else
-            {
-                return o;
             }
         }
 
-        /// <summary>
+        /// <inheritdoc/>
-        /// Selects the header of a tab item.
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        /// </summary>
-        /// <param name="o">The tab item.</param>
-        /// <returns>The content.</returns>
-        private static object SelectHeader(object o)
         {
-            var headered = o as IHeadered;
+            base.OnPointerPressed(e);
-            var control = o as IControl;
 
-            if (headered != null)
+            if (e.MouseButton == MouseButton.Left)
-            {
-                return headered.Header ?? string.Empty;
-            }
-            else if (control != null)
-            {
-                // Non-headered control items should result in TabStripItems with empty content.
-                // If a TabStrip is created with non IHeadered controls as its items, don't try to
-                // display the control in the TabStripItem: the content portion will also try to 
-                // display this control, resulting in dual-parentage breakage.
-                return string.Empty;
-            }
-            else
             {
-                return o;
+                e.Handled = UpdateSelectionFromEventSource(e.Source);
             }
         }
     }

src/Avalonia.Controls/TabItem.cs

@@ -11,12 +11,20 @@ namespace Avalonia.Controls
     /// </summary>
     public class TabItem : HeaderedContentControl, ISelectable
     {
+        /// <summary>
+        /// Defines the <see cref="TabStripPlacement"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Dock> TabStripPlacementProperty =
+            TabControl.TabStripPlacementProperty.AddOwner<TabItem>();
+
         /// <summary>
         /// Defines the <see cref="IsSelected"/> property.
         /// </summary>
         public static readonly StyledProperty<bool> IsSelectedProperty =
             ListBoxItem.IsSelectedProperty.AddOwner<TabItem>();
 
+        private TabControl _parentTabControl;
+
         /// <summary>
         /// Initializes static members of the <see cref="TabItem"/> class.
         /// </summary>
@@ -24,6 +32,19 @@ namespace Avalonia.Controls
         {
             SelectableMixin.Attach<TabItem>(IsSelectedProperty);
             FocusableProperty.OverrideDefaultValue(typeof(TabItem), true);
+            IsSelectedProperty.Changed.AddClassHandler<TabItem>(x => x.UpdateSelectedContent);
+            DataContextProperty.Changed.AddClassHandler<TabItem>(x => x.UpdateHeader);
+        }
+
+        /// <summary>
+        /// Gets the tab strip placement.
+        /// </summary>
+        /// <value>
+        /// The tab strip placement.
+        /// </value>
+        public Dock TabStripPlacement
+        {
+            get { return GetValue(TabStripPlacementProperty); }
         }
 
         /// <summary>
@@ -34,5 +55,57 @@ namespace Avalonia.Controls
             get { return GetValue(IsSelectedProperty); }
             set { SetValue(IsSelectedProperty, value); }
         }
+
+        internal TabControl ParentTabControl
+        {
+            get => _parentTabControl;
+            set => _parentTabControl = value;
+        }
+
+        private void UpdateHeader(AvaloniaPropertyChangedEventArgs obj)
+        {
+            if (Header == null)
+            {
+                if (obj.NewValue is IHeadered headered)
+                {
+                    if (Header != headered.Header)
+                    {
+                        Header = headered.Header;
+                    }
+                }
+                else
+                {
+                    if (!(obj.NewValue is IControl))
+                    {
+                        Header = obj.NewValue;
+                    }
+                }
+            }
+            else
+            {
+                if (Header == obj.OldValue)
+                {
+                    Header = obj.NewValue;
+                }
+            }          
+        }
+
+        private void UpdateSelectedContent(AvaloniaPropertyChangedEventArgs e)
+        {
+            if (!IsSelected)
+            {
+                return;
+            }
+
+            if (ParentTabControl.SelectedContentTemplate != ContentTemplate)
+            {
+                ParentTabControl.SelectedContentTemplate = ContentTemplate;
+            }
+
+            if (ParentTabControl.SelectedContent != Content)
+            {
+                ParentTabControl.SelectedContent = Content;
+            }
+        }
     }
 }

src/Avalonia.Controls/Templates/TemplateExtensions.cs

@@ -24,12 +24,14 @@ namespace Avalonia.Controls.Templates
         {
             foreach (IControl child in control.GetVisualChildren())
             {
-                if (child.TemplatedParent == templatedParent)
+                var childTemplatedParent = child.TemplatedParent;
+
+                if (childTemplatedParent == templatedParent)
                 {
                     yield return child;
                 }
 
-                if (child.TemplatedParent != null)
+                if (childTemplatedParent != null)
                 {
                     foreach (var descendant in GetTemplateChildren(child, templatedParent))
                     {

src/Avalonia.Controls/TextBox.cs

@@ -262,7 +262,6 @@ namespace Avalonia.Controls
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             _presenter = e.NameScope.Get<TextPresenter>("PART_TextPresenter");
-            _presenter.Cursor = new Cursor(StandardCursorType.Ibeam);
 
             if (IsFocused)
             {

src/Avalonia.Controls/Viewbox.cs

@@ -0,0 +1,124 @@
+using System;
+using Avalonia.Media;
+
+namespace Avalonia.Controls
+{
+    /// <summary>
+    /// Viewbox is used to scale single child.
+    /// </summary>
+    /// <seealso cref="Avalonia.Controls.Decorator" />
+    public class Viewbox : Decorator
+    {
+        /// <summary>
+        /// The stretch property
+        /// </summary>
+        public static AvaloniaProperty<Stretch> StretchProperty =
+                AvaloniaProperty.RegisterDirect<Viewbox, Stretch>(nameof(Stretch),
+                    v => v.Stretch, (c, v) => c.Stretch = v, Stretch.Uniform);
+
+        private Stretch _stretch = Stretch.Uniform;
+
+        /// <summary>
+        /// Gets or sets the stretch mode, 
+        /// which determines how child fits into the available space.
+        /// </summary>
+        /// <value>
+        /// The stretch.
+        /// </value>
+        public Stretch Stretch
+        {
+            get => _stretch;
+            set => SetAndRaise(StretchProperty, ref _stretch, value);
+        }
+
+        static Viewbox()
+        {
+            ClipToBoundsProperty.OverrideDefaultValue<Viewbox>(true);
+            AffectsMeasure<Viewbox>(StretchProperty);
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var child = Child;
+
+            if (child != null)
+            {
+                child.Measure(Size.Infinity);
+
+                var childSize = child.DesiredSize;
+
+                var scale = GetScale(availableSize, childSize, Stretch);
+
+                return childSize * scale;
+            }
+
+            return new Size();
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var child = Child;
+
+            if (child != null)
+            {
+                var childSize = child.DesiredSize;
+                var scale = GetScale(finalSize, childSize, Stretch);
+                var scaleTransform = child.RenderTransform as ScaleTransform;
+
+                if (scaleTransform == null)
+                {
+                    child.RenderTransform = scaleTransform = new ScaleTransform(scale.X, scale.Y);
+                    child.RenderTransformOrigin = RelativePoint.TopLeft;
+                }
+
+                scaleTransform.ScaleX = scale.X;
+                scaleTransform.ScaleY = scale.Y;
+
+                child.Arrange(new Rect(childSize));
+
+                return childSize * scale;
+            }
+
+            return new Size();
+        }
+
+        private static Vector GetScale(Size availableSize, Size childSize, Stretch stretch)
+        {
+            double scaleX = 1.0;
+            double scaleY = 1.0;
+
+            bool validWidth = !double.IsPositiveInfinity(availableSize.Width);
+            bool validHeight = !double.IsPositiveInfinity(availableSize.Height);
+
+            if (stretch != Stretch.None && (validWidth || validHeight))
+            {
+                scaleX = childSize.Width <= 0.0 ? 0.0 : availableSize.Width / childSize.Width;
+                scaleY = childSize.Height <= 0.0 ? 0.0 : availableSize.Height / childSize.Height;
+
+                if (!validWidth)
+                {
+                    scaleX = scaleY;
+                }
+                else if (!validHeight)
+                {
+                    scaleY = scaleX;
+                }
+                else
+                {
+                    switch (stretch)
+                    {
+                        case Stretch.Uniform:
+                            scaleX = scaleY = Math.Min(scaleX, scaleY);
+                            break;
+
+                        case Stretch.UniformToFill:
+                            scaleX = scaleY = Math.Max(scaleX, scaleY);
+                            break;
+                    }
+                }
+            }
+
+            return new Vector(scaleX, scaleY);
+        }
+    }
+}

src/Avalonia.Controls/Window.cs

@@ -397,11 +397,12 @@ namespace Avalonia.Controls
         /// <returns>
         /// A task that can be used to track the lifetime of the dialog.
         /// </returns>
-        public Task ShowDialog()
+        public Task ShowDialog(Window parent)
         {
-            return ShowDialog<object>();
+            return ShowDialog<object>(parent);
         }
 
+
         /// <summary>
         /// Shows the window as a dialog.
         /// </summary>
@@ -411,8 +412,21 @@ namespace Avalonia.Controls
         /// <returns>.
         /// A task that can be used to retrieve the result of the dialog when it closes.
         /// </returns>
-        public Task<TResult> ShowDialog<TResult>()
+        public Task<TResult> ShowDialog<TResult>(Window parent) => ShowDialog<TResult>(parent.PlatformImpl);
+        
+        /// <summary>
+        /// Shows the window as a dialog.
+        /// </summary>
+        /// <typeparam name="TResult">
+        /// The type of the result produced by the dialog.
+        /// </typeparam>
+        /// <returns>.
+        /// A task that can be used to retrieve the result of the dialog when it closes.
+        /// </returns>
+        public Task<TResult> ShowDialog<TResult>(IWindowImpl parent)
         {
+            if(parent == null)
+                throw new ArgumentNullException(nameof(parent));
             if (IsVisible)
             {
                 throw new InvalidOperationException("The window is already being shown.");
@@ -427,24 +441,18 @@ namespace Avalonia.Controls
 
             using (BeginAutoSizing())
             {
-                var affectedWindows = Application.Current.Windows.Where(w => w.IsEnabled && w != this).ToList();
-                var activated = affectedWindows.Where(w => w.IsActive).FirstOrDefault();
-                SetIsEnabled(affectedWindows, false);
 
-                var modal = PlatformImpl?.ShowDialog();
+                PlatformImpl?.ShowDialog(parent);
                 var result = new TaskCompletionSource<TResult>();
 
                 Renderer?.Start();
-
                 Observable.FromEventPattern<EventHandler, EventArgs>(
                     x => this.Closed += x,
                     x => this.Closed -= x)
                     .Take(1)
                     .Subscribe(_ =>
                     {
-                        modal?.Dispose();
+                        parent.Activate();
-                        SetIsEnabled(affectedWindows, true);
-                        activated?.Activate();
                         result.SetResult((TResult)(_dialogResult ?? default(TResult)));
                     });
 
@@ -452,14 +460,6 @@ namespace Avalonia.Controls
             }
         }
 
-        void SetIsEnabled(IEnumerable<Window> windows, bool isEnabled)
-        {
-            foreach (var window in windows)
-            {
-                window.IsEnabled = isEnabled;
-            }
-        }
-
         void SetWindowStartupLocation()
         {
             if (WindowStartupLocation == WindowStartupLocation.CenterScreen)

src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs

@@ -86,9 +86,8 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public IDisposable ShowDialog()
+        public void ShowDialog(IWindowImpl parent)
         {
-            return Disposable.Empty;
         }
 
         public void SetSystemDecorations(bool enabled)

src/Avalonia.DesignerSupport/Remote/Stubs.cs

@@ -87,7 +87,9 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public IDisposable ShowDialog() => Disposable.Empty;
+        public void ShowDialog(IWindowImpl parent)
+        {
+        }
 
         public void SetSystemDecorations(bool enabled)
         {

src/Avalonia.Layout/Properties/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]

src/Avalonia.Native/AvaloniaNativeDeferredRendererLock.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Reactive.Disposables;
+using Avalonia.Native.Interop;
+using Avalonia.Rendering;
+
+namespace Avalonia.Native
+{
+    public class AvaloniaNativeDeferredRendererLock : IDeferredRendererLock
+    {
+        private readonly IAvnWindowBase _window;
+
+        public AvaloniaNativeDeferredRendererLock(IAvnWindowBase window)
+        {
+            _window = window;
+        }
+        public IDisposable TryLock()
+        {
+            if (_window.TryLock())
+                return Disposable.Create(() => _window.Unlock());
+            return null;
+        }
+    }
+}

src/Avalonia.Native/DeferredRendererProxy.cs

@@ -1,108 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using Avalonia.Native.Interop;
-using Avalonia.Rendering;
-using Avalonia.VisualTree;
-
-namespace Avalonia.Native
-{
-    public class DeferredRendererProxy : IRenderer, IRenderLoopTask, IRenderLoop
-    {
-        public DeferredRendererProxy(IRenderRoot root, IAvnWindowBase window)
-        {
-            if (window != null)
-            {
-                _useLock = true;
-                window.AddRef();
-_window = new IAvnWindowBase(window.NativePointer);
-            }
-            _renderer = new DeferredRenderer(root, this);
-            _rendererTask = (IRenderLoopTask)_renderer;
-        }
-
-        void IRenderLoop.Add(IRenderLoopTask i)
-        {
-            AvaloniaLocator.Current.GetService<IRenderLoop>().Add(this);
-        }
-
-        void IRenderLoop.Remove(IRenderLoopTask i)
-        {
-            AvaloniaLocator.Current.GetService<IRenderLoop>().Remove(this);
-        }
-
-        private DeferredRenderer _renderer;
-        private IRenderLoopTask _rendererTask;
-        private IAvnWindowBase _window;
-        private bool _useLock;
-
-        public bool DrawFps{
-            get => _renderer.DrawFps;
-            set => _renderer.DrawFps = value;
-        }
-        public bool DrawDirtyRects 
-        {
-            get => _renderer.DrawDirtyRects;
-            set => _renderer.DrawDirtyRects = value;
-        }
-
-        public bool NeedsUpdate => _rendererTask.NeedsUpdate;
-
-        public void AddDirty(IVisual visual) => _renderer.AddDirty(visual);
-
-        public void Dispose()
-        {
-            _renderer.Dispose();
-            _window?.Dispose();
-            _window = null;
-        }
-        public IEnumerable<IVisual> HitTest(Point p, IVisual root, Func<IVisual, bool> filter)
-        {
-            return _renderer.HitTest(p, root, filter);
-        }
-
-        public void Paint(Rect rect)
-        {
-            if (NeedsUpdate)
-            {
-                Update(TimeSpan.FromMilliseconds(Environment.TickCount));
-            }
-
-            Render();
-        }
-
-        public void Resized(Size size) => _renderer.Resized(size);
-
-        public void Start() => _renderer.Start();
-
-        public void Stop() => _renderer.Stop();
-
-        public void Update(TimeSpan time)
-        {
-            _rendererTask.Update(time);
-        }
-
-        public void Render()
-        {
-            if(_useLock)
-            {
-                _rendererTask.Render();
-                return;
-            }
-            if (_window == null)
-                return;
-            if (!_window.TryLock())
-                return;
-            try
-            {
-                _rendererTask.Render();
-            }
-            finally
-            {
-                _window.Unlock();
-            }
-        }
-    }
-}

src/Avalonia.Native/GlPlatformFeature.cs

@@ -58,10 +58,8 @@ namespace Avalonia.Native
 
         public IGlDisplay Display { get; }
 
-        public void MakeCurrent(IGlSurface surface)
+        public void MakeCurrent()
         {
-            if (surface != null)
-                throw new ArgumentException(nameof(surface));
             Context.MakeCurrent();
         }
     }

src/Avalonia.Native/WindowImpl.cs

@@ -47,9 +47,9 @@ namespace Avalonia.Native
 
         public IAvnWindow Native => _native;
 
-        public IDisposable ShowDialog()
+        public void ShowDialog(IWindowImpl window)
         {
-            return _native.ShowDialog();
+            _native.ShowDialog(((WindowImpl)window).Native);
         }
 
         public void CanResize(bool value)

src/Avalonia.Native/WindowImplBase.cs

@@ -186,10 +186,6 @@ namespace Avalonia.Native
 
             void IAvnWindowBaseEvents.RunRenderPriorityJobs()
             {
-                if (_parent._deferredRendering
-                    && _parent._lastRenderedLogicalSize != _parent.ClientSize)
-                    // Hack to trigger Paint event on the renderer
-                    _parent.Paint?.Invoke(new Rect());
                 Dispatcher.UIThread.RunJobs(DispatcherPriority.Render);
             }
         }
@@ -245,7 +241,9 @@ namespace Avalonia.Native
         public IRenderer CreateRenderer(IRenderRoot root)
         {
             if (_deferredRendering)
-                return new DeferredRendererProxy(root, _gpu ? _native : null);
+                return new DeferredRenderer(root, AvaloniaLocator.Current.GetService<IRenderLoop>(),
+                    rendererLock:
+                    _gpu ? new AvaloniaNativeDeferredRendererLock(_native) : null);
             return new ImmediateRenderer(root);
         }
 

src/Avalonia.OpenGL/EglContext.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+
+namespace Avalonia.OpenGL
+{
+    public class EglContext : IGlContext
+    {
+        private readonly EglDisplay _disp;
+        private readonly EglInterface _egl;
+        private readonly object _lock = new object();
+
+        public EglContext(EglDisplay display, EglInterface egl, IntPtr ctx, IntPtr offscreenSurface)
+        {
+            _disp = display;
+            _egl = egl;
+            Context = ctx;
+            OffscreenSurface = offscreenSurface;
+        }
+
+        public IntPtr Context { get; }
+        public IntPtr OffscreenSurface { get; }
+        public IGlDisplay Display => _disp;
+
+        public IDisposable Lock()
+        {
+            Monitor.Enter(_lock);
+            return Disposable.Create(() => Monitor.Exit(_lock));
+        }
+
+        public void MakeCurrent()
+        {
+            if (!_egl.MakeCurrent(_disp.Handle, IntPtr.Zero, IntPtr.Zero, Context))
+                throw new OpenGlException("eglMakeCurrent failed");
+        }
+        
+        public void MakeCurrent(EglSurface surface)
+        {
+            var surf = ((EglSurface)surface)?.DangerousGetHandle() ?? OffscreenSurface;
+            if (!_egl.MakeCurrent(_disp.Handle, surf, surf, Context))
+                throw new OpenGlException("eglMakeCurrent failed");
+        }
+    }
+}

src/Avalonia.OpenGL/EglDisplay.cs

@@ -13,6 +13,7 @@ namespace Avalonia.OpenGL
         private readonly IntPtr _config;
         private readonly int[] _contextAttributes;
 
+        public IntPtr Handle => _display;
         public EglDisplay(EglInterface egl)
         {
             _egl = egl;  
@@ -121,7 +122,7 @@ namespace Avalonia.OpenGL
             });
             if (surf == IntPtr.Zero)
                 throw new OpenGlException("eglCreatePbufferSurface failed");
-            var rv = new EglContext(this, ctx, surf);
+            var rv = new EglContext(this, _egl, ctx, surf);
             rv.MakeCurrent(null);
             return rv;
         }
@@ -132,12 +133,12 @@ namespace Avalonia.OpenGL
                 throw new OpenGlException("eglMakeCurrent failed");
         }
 
-        public IGlSurface CreateWindowSurface(IntPtr window)
+        public EglSurface CreateWindowSurface(IntPtr window)
         {
             var s = _egl.CreateWindowSurface(_display, _config, window, new[] {EGL_NONE, EGL_NONE});
             if (s == IntPtr.Zero)
                 throw new OpenGlException("eglCreateWindowSurface failed");
-            return new EglSurface(this, s);
+            return new EglSurface(this, _egl, s);
         }
 
         public int SampleCount
@@ -157,49 +158,5 @@ namespace Avalonia.OpenGL
                 return rv;
             }
         }
-
-        class EglSurface : SafeHandle, IGlSurface
-        {
-            private readonly EglDisplay _display;
-
-            public EglSurface(EglDisplay display, IntPtr surface)  : base(surface, true)
-            {
-                _display = display;
-            }
-
-            protected override bool ReleaseHandle()
-            {
-                _display._egl.DestroySurface(_display._display, handle);
-                return true;
-            }
-
-            public override bool IsInvalid => handle == IntPtr.Zero;
-
-            public IGlDisplay Display => _display;
-            public void SwapBuffers() => _display._egl.SwapBuffers(_display._display, handle);
-        }
-        
-        class EglContext : IGlContext
-        {
-            private readonly EglDisplay _disp;
-
-            public EglContext(EglDisplay display, IntPtr ctx, IntPtr offscreenSurface)
-            {
-                _disp = display;
-                Context = ctx;
-                OffscreenSurface = offscreenSurface;
-            }
-
-            public IntPtr Context { get; }
-            public IntPtr OffscreenSurface { get; }
-            public IGlDisplay Display => _disp;
-
-            public void MakeCurrent(IGlSurface surface)
-            {
-                var surf = ((EglSurface)surface)?.DangerousGetHandle() ?? OffscreenSurface;
-                if (!_disp._egl.MakeCurrent(_disp._display, surf, surf, Context))
-                    throw new OpenGlException("eglMakeCurrent failed");
-            }
-        }
     }
 }

src/Avalonia.OpenGL/EglGlPlatformFeature.cs

@@ -7,7 +7,7 @@ namespace Avalonia.OpenGL
     {
         public IGlDisplay Display { get; set; }
         public IGlContext ImmediateContext { get; set; }
-        public IGlContext DeferredContext { get; set; }
+        public EglContext DeferredContext { get; set; }
 
         public static void TryInitialize()
         {
@@ -26,7 +26,7 @@ namespace Avalonia.OpenGL
                 {
                     Display = disp,
                     ImmediateContext = ctx,
-                    DeferredContext = disp.CreateContext(ctx)
+                    DeferredContext = (EglContext)disp.CreateContext(ctx)
                 };
             }
             catch(Exception e)

src/Avalonia.OpenGL/EglGlPlatformSurface.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 
 namespace Avalonia.OpenGL
 {
@@ -12,10 +13,10 @@ namespace Avalonia.OpenGL
         }
 
         private readonly EglDisplay _display;
-        private readonly IGlContext _context;
+        private readonly EglContext _context;
         private readonly IEglWindowGlPlatformSurfaceInfo _info;
         
-        public EglGlPlatformSurface(EglDisplay display, IGlContext context, IEglWindowGlPlatformSurfaceInfo info)
+        public EglGlPlatformSurface(EglDisplay display, EglContext context, IEglWindowGlPlatformSurfaceInfo info)
         {
             _display = display;
             _context = context;
@@ -30,11 +31,11 @@ namespace Avalonia.OpenGL
 
         class RenderTarget : IGlPlatformSurfaceRenderTarget
         {
-            private readonly IGlContext _context;
+            private readonly EglContext _context;
-            private readonly IGlSurface _glSurface;
+            private readonly EglSurface _glSurface;
             private readonly IEglWindowGlPlatformSurfaceInfo _info;
 
-            public RenderTarget(IGlContext context, IGlSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
+            public RenderTarget(EglContext context, EglSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
             {
                 _context = context;
                 _glSurface = glSurface;
@@ -45,21 +46,33 @@ namespace Avalonia.OpenGL
 
             public IGlPlatformSurfaceRenderingSession BeginDraw()
             {
-                _context.MakeCurrent(_glSurface);
+                var l = _context.Lock();
-                return new Session(_context, _glSurface, _info);
+                try
+                {
+                    _context.MakeCurrent(_glSurface);
+                    return new Session(_context, _glSurface, _info, l);
+                }
+                catch
+                {
+                    l.Dispose();
+                    throw;
+                }
             }
             
             class Session : IGlPlatformSurfaceRenderingSession
             {
                 private readonly IGlContext _context;
-                private readonly IGlSurface _glSurface;
+                private readonly EglSurface _glSurface;
                 private readonly IEglWindowGlPlatformSurfaceInfo _info;
+                private IDisposable _lock;
 
-                public Session(IGlContext context, IGlSurface glSurface, IEglWindowGlPlatformSurfaceInfo info)
+                public Session(IGlContext context, EglSurface glSurface, IEglWindowGlPlatformSurfaceInfo info,
+                    IDisposable @lock)
                 {
                     _context = context;
                     _glSurface = glSurface;
                     _info = info;
+                    _lock = @lock;
                 }
 
                 public void Dispose()
@@ -67,6 +80,7 @@ namespace Avalonia.OpenGL
                     _context.Display.GlInterface.Flush();
                     _glSurface.SwapBuffers();
                     _context.Display.ClearContext();
+                    _lock.Dispose();
                 }
 
                 public IGlDisplay Display => _context.Display;

src/Avalonia.OpenGL/EglSurface.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Avalonia.OpenGL
+{
+    public class EglSurface : SafeHandle
+    {
+        private readonly EglDisplay _display;
+        private readonly EglInterface _egl;
+
+        public EglSurface(EglDisplay display, EglInterface egl, IntPtr surface)  : base(surface, true)
+        {
+            _display = display;
+            _egl = egl;
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            _egl.DestroySurface(_display.Handle, handle);
+            return true;
+        }
+
+        public override bool IsInvalid => handle == IntPtr.Zero;
+
+        public IGlDisplay Display => _display;
+        public void SwapBuffers() => _egl.SwapBuffers(_display.Handle, handle);
+    }
+}

src/Avalonia.OpenGL/IGlContext.cs

@@ -3,6 +3,6 @@ namespace Avalonia.OpenGL
     public interface IGlContext
     {
         IGlDisplay Display { get; }
-        void MakeCurrent(IGlSurface surface);
+        void MakeCurrent();
     }
 }

src/Avalonia.OpenGL/IGlSurface.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace Avalonia.OpenGL
-{
-    public interface IGlSurface : IDisposable
-    {
-        IGlDisplay Display { get; }
-        void SwapBuffers();
-    }
-}

src/Avalonia.Styling/StyledElement.cs

@@ -49,8 +49,11 @@ namespace Avalonia
         /// <summary>
         /// Defines the <see cref="TemplatedParent"/> property.
         /// </summary>
-        public static readonly StyledProperty<ITemplatedControl> TemplatedParentProperty =
+        public static readonly DirectProperty<StyledElement, ITemplatedControl> TemplatedParentProperty =
-            AvaloniaProperty.Register<StyledElement, ITemplatedControl>(nameof(TemplatedParent), inherits: true);
+            AvaloniaProperty.RegisterDirect<StyledElement, ITemplatedControl>(
+                nameof(TemplatedParent),
+                o => o.TemplatedParent,
+                (o ,v) => o.TemplatedParent = v);
 
         private int _initCount;
         private string _name;
@@ -62,6 +65,7 @@ namespace Avalonia
         private Styles _styles;
         private bool _styled;
         private Subject<IStyleable> _styleDetach = new Subject<IStyleable>();
+        private ITemplatedControl _templatedParent;
         private bool _dataContextUpdating;
 
         /// <summary>
@@ -269,8 +273,8 @@ namespace Avalonia
         /// </summary>
         public ITemplatedControl TemplatedParent
         {
-            get { return GetValue(TemplatedParentProperty); }
+            get => _templatedParent;
-            internal set { SetValue(TemplatedParentProperty, value); }
+            internal set => SetAndRaise(TemplatedParentProperty, ref _templatedParent, value);
         }
 
         /// <summary>

src/Avalonia.Themes.Default/Accents/BaseDark.xaml

@@ -52,5 +52,7 @@
         <sys:Double x:Key="FontSizeSmall">10</sys:Double>
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
+
+        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
     </Style.Resources>
 </Style>

src/Avalonia.Themes.Default/Accents/BaseLight.xaml

@@ -52,5 +52,7 @@
         <sys:Double x:Key="FontSizeSmall">10</sys:Double>
         <sys:Double x:Key="FontSizeNormal">12</sys:Double>
         <sys:Double x:Key="FontSizeLarge">16</sys:Double>
+
+        <sys:Double x:Key="ScrollBarThickness">10</sys:Double>
     </Style.Resources>
 </Style>

src/Avalonia.Themes.Default/ButtonSpinner.xaml

@@ -1,17 +1,17 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="ButtonSpinner">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
   </Style>
   <Style Selector="ButtonSpinner /template/ RepeatButton">
-    <Setter Property="RepeatButton.Background" Value="Transparent"/>
+    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="RepeatButton.BorderBrush" Value="Transparent"/>
+    <Setter Property="BorderBrush" Value="Transparent"/>
   </Style>
   <Style Selector="ButtonSpinner /template/ RepeatButton:pointerover">
-    <Setter Property="RepeatButton.Background" Value="{DynamicResource ThemeControlMidBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}"/>
-    <Setter Property="RepeatButton.BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
   </Style>
   <Style Selector="ButtonSpinner /template/ RepeatButton#PART_IncreaseButton">
     <Setter Property="Content">
@@ -42,7 +42,8 @@
   <Style Selector="ButtonSpinner:right">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 Margin="{TemplateBinding Padding}"
@@ -67,7 +68,8 @@
   <Style Selector="ButtonSpinner:left">
     <Setter Property="Template">
       <ControlTemplate>
-        <Border Background="{TemplateBinding Background}"
+        <Border Name="border"
+                Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 Margin="{TemplateBinding Padding}"
@@ -89,7 +91,13 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  <Style Selector="ButtonSpinner:pointerover">
+  <Style Selector="ButtonSpinner:pointerover /template/ Border#border">
-    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
+  </Style>
+  <Style Selector="ButtonSpinner:focus /template/ Border#border">
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}"/>
+  </Style>
+  <Style Selector="ButtonSpinner:error /template/ Border#border">
+    <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
   </Style>
 </Styles>

src/Avalonia.Themes.Default/DefaultTheme.xaml

@@ -12,7 +12,6 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.DropDownItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.GridSplitter.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ItemsControl.xaml?assembly=Avalonia.Themes.Default"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Default.LayoutTransformControl.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ListBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ListBoxItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Menu.xaml?assembly=Avalonia.Themes.Default"/>
@@ -30,6 +29,7 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.TabStripItem.xaml?assembly=Avalonia.Themes.Default"/>
   <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
   <StyleInclude Source="resm:Avalonia.Themes.Default.TabControl.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.TabItem.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.TextBox.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.ToggleButton.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.Expander.xaml?assembly=Avalonia.Themes.Default"/>

src/Avalonia.Themes.Default/LayoutTransformControl.xaml

@@ -1,13 +0,0 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="LayoutTransformControl">
-  <Setter Property="Template">
-    <ControlTemplate>
-      <ContentPresenter Name="PART_ContentPresenter"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        Content="{TemplateBinding Content}" 
-                        Padding="{TemplateBinding Padding}"/>
-    </ControlTemplate>
-  </Setter>
-</Style>

src/Avalonia.Themes.Default/NumericUpDown.xaml

@@ -1,10 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui">
   <Style Selector="NumericUpDown">
-    <Setter Property="TemplatedControl.BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}"/>
+    <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
-    <Setter Property="TemplatedControl.BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-    <Setter Property="TemplatedControl.Background" Value="{DynamicResource ThemeBackgroundBrush}" />
+    <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
-    <Setter Property="TemplatedControl.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="Padding" Value="4"/>
-    <Setter Property="TemplatedControl.Template">
+    <Setter Property="Template">
       <ControlTemplate>
         <ButtonSpinner Name="PART_Spinner"
                        Background="{TemplateBinding Background}"
@@ -17,20 +17,13 @@
                        ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
           <TextBox Name="PART_TextBox"
                    BorderThickness="0"
-                   Background="Transparent"
+                   Background="{TemplateBinding Background}" 
-                   ContextMenu="{TemplateBinding ContextMenu}"
+                   BorderBrush="{TemplateBinding BorderBrush}"
-                   FontFamily="{TemplateBinding FontFamily}"
+                   Padding="{TemplateBinding Padding}"
-                   FontSize="{TemplateBinding FontSize}"
-                   FontStyle="{TemplateBinding FontStyle}"
-                   FontWeight="{TemplateBinding FontWeight}"
-                   Foreground="{TemplateBinding Foreground}"
                    Watermark="{TemplateBinding Watermark}"
+                   DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                    IsReadOnly="{TemplateBinding IsReadOnly}"
                    Text="{TemplateBinding Text}"
-                   Padding="{TemplateBinding Padding}"
-                   TextAlignment="Left"
-                   Margin="1"
-                   MinWidth="20"
                    AcceptsReturn="False"
                    TextWrapping="NoWrap">
           </TextBox>
@@ -38,4 +31,8 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  <Style Selector="NumericUpDown /template/ TextBox#PART_TextBox">
+    <Setter Property="Margin" Value="4"/>
+    <Setter Property="MinWidth" Value="20"/>
+  </Style>
 </Styles>

src/Avalonia.Themes.Default/ScrollBar.xaml

@@ -3,7 +3,7 @@
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{DynamicResource ThemeControlMidBrush}">
-                    <Grid RowDefinitions="10,*,10">
+                    <Grid RowDefinitions="Auto,*,Auto">
                         <RepeatButton Name="PART_LineUpButton"
                                       Classes="repeat"
                                       Grid.Row="0"
@@ -53,12 +53,11 @@
         </Setter>
     </Style>
     <Style Selector="ScrollBar:horizontal">
-        <Setter Property="Height"
+        <Setter Property="Height" Value="{DynamicResource ScrollBarThickness}" />
-                Value="10" />
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{DynamicResource ThemeControlMidBrush}">
-                    <Grid ColumnDefinitions="10,*,10">
+                    <Grid ColumnDefinitions="Auto,*,Auto">
                         <RepeatButton Name="PART_LineUpButton"
                                       Classes="repeat"
                                       Grid.Row="0"
@@ -108,22 +107,17 @@
         </Setter>
     </Style>
     <Style Selector="ScrollBar:horizontal /template/ Thumb#thumb">
-        <Setter Property="MinWidth"
+        <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
-                Value="10" />
     </Style>
     <Style Selector="ScrollBar:vertical">
-        <Setter Property="Width"
+        <Setter Property="Width" Value="{DynamicResource ScrollBarThickness}" />
-                Value="10" />
     </Style>
     <Style Selector="ScrollBar:vertical /template/ Thumb#thumb">
-        <Setter Property="MinHeight"
+        <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
-                Value="10" />
     </Style>
     <Style Selector="ScrollBar /template/ RepeatButton.repeat">
-        <Setter Property="Padding"
+        <Setter Property="Padding" Value="2" />
-                Value="2" />
+        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BorderThickness"
-                Value="0" />
     </Style>
     <Style Selector="ScrollBar /template/ RepeatButton.repeattrack">
         <Setter Property="Template">

src/Avalonia.Themes.Default/TabControl.xaml

@@ -1,50 +1,56 @@
 <Styles xmlns="https://github.com/avaloniaui"  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Style Selector="TabControl">
+    <Style Selector="TabControl">
-    <Setter Property="Template">
+        <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
-      <ControlTemplate>
+        <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
-        <Border Background="{TemplateBinding Background}"
+        <Setter Property="Padding" Value="4"/>
-                BorderBrush="{TemplateBinding BorderBrush}"
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-                BorderThickness="{TemplateBinding BorderThickness}">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-          <DockPanel>
+        <Setter Property="Template">
-            <TabStrip Name="PART_TabStrip"
+            <ControlTemplate>
-                      MemberSelector="{x:Static TabControl.HeaderSelector}"
+                <Border
-                      Items="{TemplateBinding Items}"
+                    Margin="{TemplateBinding Margin}"
-                      SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}"/>
+                    BorderBrush="{TemplateBinding BorderBrush}"
-            <Carousel Name="PART_Content"
+                    BorderThickness="{TemplateBinding BorderThickness}"
-                      MemberSelector="{x:Static TabControl.ContentSelector}"
+                    Background="{TemplateBinding Background}"
-                      Items="{TemplateBinding Items}"
+                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                      SelectedIndex="{TemplateBinding SelectedIndex}"
+                    VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                      PageTransition="{TemplateBinding PageTransition}"
+                    <DockPanel>
-                      Grid.Row="1"/>
+                        <ItemsPresenter
-          </DockPanel>
+                            Name="PART_ItemsPresenter"
-        </Border>
+                            Items="{TemplateBinding Items}"
-      </ControlTemplate>
+                            ItemsPanel="{TemplateBinding ItemsPanel}"
-    </Setter>
+                            ItemTemplate="{TemplateBinding ItemTemplate}"
-  </Style>
+                            MemberSelector="{TemplateBinding MemberSelector}"                     >
-  <Style Selector="TabControl[TabStripPlacement=Top] /template/ TabStrip">
+                        </ItemsPresenter>
-    <Setter Property="DockPanel.Dock" Value="Top"/>
+                        <ContentPresenter
-  </Style>
+                            Name="PART_Content"
-  <Style Selector="TabControl[TabStripPlacement=Bottom] /template/ TabStrip">
+                            Margin="{TemplateBinding Padding}"
-    <Setter Property="DockPanel.Dock" Value="Bottom"/>
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-  </Style>
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-  <Style Selector="TabControl[TabStripPlacement=Left] /template/ TabStrip">
+                            Content="{TemplateBinding SelectedContent}"
-    <Setter Property="DockPanel.Dock" Value="Left"/>
+                            ContentTemplate="{TemplateBinding SelectedContentTemplate}">
-    <Setter Property="ItemsPanel">
+                        </ContentPresenter>
-      <Setter.Value>
+                    </DockPanel>
-        <ItemsPanelTemplate>
+                </Border>
-          <StackPanel Orientation="Vertical"/>
+            </ControlTemplate>
-        </ItemsPanelTemplate>
+        </Setter>
-      </Setter.Value>
+    </Style>
-    </Setter>
+    <Style Selector="TabControl[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
-  </Style>
+        <Setter Property="DockPanel.Dock" Value="Top"/>
-  <Style Selector="TabControl[TabStripPlacement=Right] /template/ TabStrip">
+    </Style>
-    <Setter Property="DockPanel.Dock" Value="Right"/>
+    <Style Selector="TabControl[TabStripPlacement=Bottom] /template/ ItemsPresenter#PART_ItemsPresenter">
-    <Setter Property="ItemsPanel">
+        <Setter Property="DockPanel.Dock" Value="Bottom"/>
-      <Setter.Value>
+    </Style>
-        <ItemsPanelTemplate>
+    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter">
-          <StackPanel Orientation="Vertical"/>
+        <Setter Property="DockPanel.Dock" Value="Left"/>
-        </ItemsPanelTemplate>
+    </Style>
-      </Setter.Value>
+    <Style Selector="TabControl[TabStripPlacement=Left] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
-    </Setter>
+        <Setter Property="Orientation" Value="Vertical"/>
-  </Style>
+    </Style>
+    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter">
+        <Setter Property="DockPanel.Dock" Value="Right"/>
+    </Style>
+    <Style Selector="TabControl[TabStripPlacement=Right] /template/ ItemsPresenter#PART_ItemsPresenter > WrapPanel">
+        <Setter Property="Orientation" Value="Vertical"/>
+    </Style>
 </Styles>

src/Avalonia.Themes.Default/TabItem.xaml

@@ -0,0 +1,39 @@
+<Styles xmlns="https://github.com/avaloniaui">
+    <Style Selector="TabItem">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLightBrush}"/>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <ContentPresenter 
+                    Name="PART_ContentPresenter"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                    Content="{TemplateBinding Header}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Padding="{TemplateBinding Padding}"/>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+    <Style Selector="TabItem:disabled">
+        <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}"/>
+    </Style>
+    <Style Selector="TabItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+    </Style>
+    <Style Selector="TabItem:selected /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}"/>
+    </Style>
+    <Style Selector="TabItem:selected:focus /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
+    </Style>
+    <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}"/>
+    </Style>
+    <Style Selector="TabItem:selected:focus:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+        <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush2}"/>
+    </Style>
+</Styles>

src/Avalonia.Themes.Default/TextBox.xaml

@@ -62,4 +62,7 @@
   <Style Selector="TextBox:error /template/ Border#border">
     <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
   </Style>
+  <Style Selector="TextBox">
+    <Setter Property="Cursor" Value="IBeam" />
+  </Style>
 </Styles>

src/Avalonia.Visuals/Rendering/DeferredRenderer.cs

@@ -36,6 +36,8 @@ namespace Avalonia.Rendering
         private int _lastSceneId = -1;
         private DisplayDirtyRects _dirtyRectsDisplay = new DisplayDirtyRects();
         private IRef<IDrawOperation> _currentDraw;
+        private readonly IDeferredRendererLock _lock;
+        private readonly object _sceneLock = new object();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DeferredRenderer"/> class.
@@ -44,11 +46,13 @@ namespace Avalonia.Rendering
         /// <param name="renderLoop">The render loop.</param>
         /// <param name="sceneBuilder">The scene builder to use. Optional.</param>
         /// <param name="dispatcher">The dispatcher to use. Optional.</param>
+        /// <param name="rendererLock">Lock object used before trying to access render target</param>
         public DeferredRenderer(
             IRenderRoot root,
             IRenderLoop renderLoop,
             ISceneBuilder sceneBuilder = null,
-            IDispatcher dispatcher = null)
+            IDispatcher dispatcher = null,
+            IDeferredRendererLock rendererLock = null)
         {
             Contract.Requires<ArgumentNullException>(root != null);
 
@@ -57,6 +61,7 @@ namespace Avalonia.Rendering
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
             Layers = new RenderLayers();
             _renderLoop = renderLoop;
+            _lock = rendererLock ?? new ManagedDeferredRendererLock();
         }
 
         /// <summary>
@@ -80,6 +85,7 @@ namespace Avalonia.Rendering
             RenderTarget = renderTarget;
             _sceneBuilder = sceneBuilder ?? new SceneBuilder();
             Layers = new RenderLayers();
+            _lock = new ManagedDeferredRendererLock();
         }
 
         /// <inheritdoc/>
@@ -114,8 +120,13 @@ namespace Avalonia.Rendering
         /// </summary>
         public void Dispose()
         {
-            var scene = Interlocked.Exchange(ref _scene, null);
+            lock (_sceneLock)
-            scene?.Dispose();
+            {
+                var scene = _scene;
+                _scene = null;
+                scene?.Dispose();
+            }
+
             Stop();
 
             Layers.Clear();
@@ -130,13 +141,18 @@ namespace Avalonia.Rendering
                 // When unit testing the renderLoop may be null, so update the scene manually.
                 UpdateScene();
             }
-
+            //It's safe to access _scene here without a lock since
+            //it's only changed from UI thread which we are currently on
             return _scene?.Item.HitTest(p, root, filter) ?? Enumerable.Empty<IVisual>();
         }
 
         /// <inheritdoc/>
         public void Paint(Rect rect)
         {
+            var t = (IRenderLoopTask)this;
+            if(t.NeedsUpdate)
+                UpdateScene();
+            Render(true);
         }
 
         /// <inheritdoc/>
@@ -164,17 +180,12 @@ namespace Avalonia.Rendering
             }
         }
 
-        bool IRenderLoopTask.NeedsUpdate => _dirty == null || _dirty.Count > 0;
+        bool NeedsUpdate => _dirty == null || _dirty.Count > 0;
+        bool IRenderLoopTask.NeedsUpdate => NeedsUpdate;
 
         void IRenderLoopTask.Update(TimeSpan time) => UpdateScene();
 
-        void IRenderLoopTask.Render()
+        void IRenderLoopTask.Render() => Render(false);
-        {
-            using (var scene = _scene?.Clone())
-            {
-                Render(scene?.Item);
-            }
-        }
 
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
@@ -195,69 +206,105 @@ namespace Avalonia.Rendering
 
         internal void UnitTestUpdateScene() => UpdateScene();
 
-        internal void UnitTestRender() => Render(_scene.Item);
+        internal void UnitTestRender() => Render(false);
 
-        private void Render(Scene scene)
+        private void Render(bool forceComposite)
         {
-            bool renderOverlay = DrawDirtyRects || DrawFps;
+            using (var l = _lock.TryLock())
-            bool composite = false;
-
-            if (RenderTarget == null)
-            {
-                RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
-            }
-
-            if (renderOverlay)
             {
-                _dirtyRectsDisplay.Tick();
+                if (l == null)
-            }
+                    return;
 
-            try
+                IDrawingContextImpl context = null;
-            {
+                try
-                if (scene != null && scene.Size != Size.Empty)
                 {
-                    IDrawingContextImpl context = null;
+                    try
-
-                    if (scene.Generation != _lastSceneId)
                     {
-                        context = RenderTarget.CreateDrawingContext(this);
+                        IDrawingContextImpl GetContext()
-                        Layers.Update(scene, context);
+                        {
+                            if (context != null)
+                                return context;
+                            if (RenderTarget == null)
+                                RenderTarget = ((IRenderRoot)_root).CreateRenderTarget();
+                            return context = RenderTarget.CreateDrawingContext(this);
 
-                        RenderToLayers(scene);
+                        }
 
-                        if (DebugFramesPath != null)
+                        var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(GetContext);
+                        using (scene)
                         {
-                            SaveDebugFrames(scene.Generation);
+                            var overlay = DrawDirtyRects || DrawFps;
+                            if (DrawDirtyRects)
+                                _dirtyRectsDisplay.Tick();
+                            if (overlay)
+                                RenderOverlay(scene.Item, GetContext());
+                            if (updated || forceComposite || overlay)
+                                RenderComposite(scene.Item, GetContext());
                         }
+                    }
+                    finally
+                    {
+                        context?.Dispose();
+                    }
+                }
+                catch (RenderTargetCorruptedException ex)
+                {
+                    Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
+                    RenderTarget?.Dispose();
+                    RenderTarget = null;
+                }
+            }
+        }
 
-                        _lastSceneId = scene.Generation;
+        private (IRef<Scene> scene, bool updated) UpdateRenderLayersAndConsumeSceneIfNeeded(Func<IDrawingContextImpl> contextFactory,
+            bool recursiveCall = false)
+        {
+            IRef<Scene> sceneRef;
+            lock (_sceneLock)
+                sceneRef = _scene?.Clone();
+            if (sceneRef == null)
+                return (null, false);
+            using (sceneRef)
+            {
+                var scene = sceneRef.Item;
+                if (scene.Generation != _lastSceneId)
+                {
+                    var context = contextFactory();
+                    Layers.Update(scene, context);
 
-                        composite = true;
+                    RenderToLayers(scene);
-                    }
 
-                    if (renderOverlay)
+                    if (DebugFramesPath != null)
                     {
-                        context = context ?? RenderTarget.CreateDrawingContext(this);
+                        SaveDebugFrames(scene.Generation);
-                        RenderOverlay(scene, context);
-                        RenderComposite(scene, context);
                     }
-                    else if (composite)
+
+                    lock (_sceneLock)
+                        _lastSceneId = scene.Generation;
+
+
+                    // We have consumed the previously available scene, but there might be some dirty 
+                    // rects since the last update. *If* we are on UI thread, we can force immediate scene
+                    // rebuild before rendering anything on-screen
+                    // We are calling the same method recursively here 
+                    if (!recursiveCall && Dispatcher.UIThread.CheckAccess() && NeedsUpdate)
                     {
-                        context = context ?? RenderTarget.CreateDrawingContext(this);
+                        UpdateScene();
-                        RenderComposite(scene, context);
+                        var (rs, _) = UpdateRenderLayersAndConsumeSceneIfNeeded(contextFactory, true);
+                        return (rs, true);
                     }
                     
-                    context?.Dispose();
+                    // Indicate that we have updated the layers
+                    return (sceneRef.Clone(), true);
                 }
+                
+                // Just return scene, layers weren't updated
+                return (sceneRef.Clone(), false);
             }
-            catch (RenderTargetCorruptedException ex)
+            
-            {
-                Logging.Logger.Information("Renderer", this, "Render target was corrupted. Exception: {0}", ex);
-                RenderTarget?.Dispose();
-                RenderTarget = null;
-            }
         }
 
+
         private void Render(IDrawingContextImpl context, VisualNode node, IVisual layer, Rect clipBounds)
         {
             if (layer == null || node.LayerRoot == layer)
@@ -393,6 +440,11 @@ namespace Avalonia.Rendering
         private void UpdateScene()
         {
             Dispatcher.UIThread.VerifyAccess();
+            lock (_sceneLock)
+            {
+                if (_scene?.Item.Generation > _lastSceneId)
+                    return;
+            }
             if (_root.IsVisible)
             {
                 var sceneRef = RefCountable.Create(_scene?.Item.CloneScene() ?? new Scene(_root));
@@ -411,16 +463,23 @@ namespace Avalonia.Rendering
                     }
                 }
 
-                var oldScene = Interlocked.Exchange(ref _scene, sceneRef);
+                lock (_sceneLock)
-                oldScene?.Dispose();
+                {
+                    var oldScene = _scene;
+                    _scene = sceneRef;
+                    oldScene?.Dispose();
+                }
 
                 _dirty.Clear();
-                (_root as IRenderRoot)?.Invalidate(new Rect(scene.Size));
             }
             else
             {
-                var oldScene = Interlocked.Exchange(ref _scene, null);
+                lock (_sceneLock)
-                oldScene?.Dispose();
+                {
+                    var oldScene = _scene;
+                    _scene = null;
+                    oldScene?.Dispose();
+                }
             }
         }
 

src/Avalonia.Visuals/Rendering/IDeferredRendererLock.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Avalonia.Rendering
+{
+    public interface IDeferredRendererLock
+    {
+        IDisposable TryLock();
+    }
+}

src/Avalonia.Visuals/Rendering/ManagedDeferredRendererLock.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+
+namespace Avalonia.Rendering
+{
+    public class ManagedDeferredRendererLock : IDeferredRendererLock
+    {
+        private readonly object _lock = new object();
+        public IDisposable TryLock()
+        {
+            if (Monitor.TryEnter(_lock))
+                return Disposable.Create(() => Monitor.Exit(_lock));
+            return null;
+        }
+    }
+}

src/Gtk/Avalonia.Gtk3/Interop/Native.cs

@@ -68,6 +68,9 @@ namespace Avalonia.Gtk3.Interop
             [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
             public delegate void gtk_window_set_modal(GtkWindow window, bool modal);
             
+            [UnmanagedFunctionPointer(CallingConvention.Cdecl), GtkImport(GtkDll.Gtk)]
+            public delegate void gtk_window_set_transient_for(GtkWindow window, IntPtr parent);
+
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)] //No manual import
             public delegate IntPtr gdk_get_native_handle(IntPtr gdkWindow);
 
@@ -408,6 +411,7 @@ namespace Avalonia.Gtk3.Interop
         public static D.gtk_window_new GtkWindowNew;
         public static D.gtk_window_set_icon GtkWindowSetIcon;
         public static D.gtk_window_set_modal GtkWindowSetModal;
+        public static D.gtk_window_set_transient_for GtkWindowSetTransientFor;
         public static D.gdk_set_allowed_backends GdkSetAllowedBackends;
         public static D.gtk_init GtkInit;
         public static D.gtk_window_present GtkWindowPresent;

src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs

@@ -265,6 +265,8 @@ namespace Avalonia.Gtk3
                 Paint?.Invoke(new Rect(ClientSize));
                 CurrentCairoContext = IntPtr.Zero;
             }
+            else
+                Paint?.Invoke(new Rect(ClientSize));
             return true;
         }
 
@@ -422,7 +424,7 @@ namespace Avalonia.Gtk3
             Native.GdkWindowSetCursor(Native.GtkWidgetGetWindow(GtkWidget), cursor?.Handle ??  IntPtr.Zero);
         }
 
-        public void Show() => Native.GtkWindowPresent(GtkWidget);
+        public virtual void Show() => Native.GtkWindowPresent(GtkWidget);
 
         public void Hide() => Native.GtkWidgetHide(GtkWidget);
 

src/Gtk/Avalonia.Gtk3/WindowImpl.cs

@@ -63,11 +63,18 @@ namespace Avalonia.Gtk3
 
         public Action<WindowState> WindowStateChanged { get; set; }
 
-        public IDisposable ShowDialog()
+        public void ShowDialog(IWindowImpl parent)
         {
             Native.GtkWindowSetModal(GtkWidget, true);
-            Show();
+            Native.GtkWindowSetTransientFor(GtkWidget, ((WindowImpl)parent).GtkWidget.DangerousGetHandle());
-            return new EmptyDisposable();
+            Native.GtkWindowPresent(GtkWidget);
+        }
+
+        public override void Show()
+        {
+            Native.GtkWindowSetModal(GtkWidget, false);
+            Native.GtkWindowSetTransientFor(GtkWidget, IntPtr.Zero);
+            Native.GtkWindowPresent(GtkWidget);
         }
 
         public void SetSystemDecorations(bool enabled) => Native.GtkWindowSetDecorated(GtkWidget, enabled);

src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs

@@ -1,13 +1,12 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
 using Avalonia.Data;
+using Portable.Xaml.Markup;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
-    using Portable.Xaml.Markup;
-    using System;
-
     public class RelativeSourceExtension : MarkupExtension
     {
         public RelativeSourceExtension()
@@ -24,10 +23,19 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             return new RelativeSource
             {
                 Mode = Mode,
+                AncestorType = AncestorType,
+                AncestorLevel = AncestorLevel,
+                Tree = Tree,
             };
         }
 
         [ConstructorArgument("mode")]
-        public RelativeSourceMode Mode { get; set; }
+        public RelativeSourceMode Mode { get; set; } = RelativeSourceMode.FindAncestor;
+
+        public Type AncestorType { get; set; }
+
+        public TreeType Tree { get; set; }
+
+        public int AncestorLevel { get; set; } = 1;
     }
 }

src/Shared/PlatformSupport/StandardRuntimePlatform.cs

@@ -89,9 +89,11 @@ namespace Avalonia.Shared.PlatformSupport
 #if DEBUG
                 if (Thread.CurrentThread.ManagedThreadId == GCThread?.ManagedThreadId)
                 {
-                    Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+                    lock(_lock)
-                                            + Environment.StackTrace
+                        if (!IsDisposed)
-                                            + "\n\nBlob created by " + _backtrace);
+                            Console.Error.WriteLine("Native blob disposal from finalizer thread\nBacktrace: "
+                                                    + Environment.StackTrace
+                                                    + "\n\nBlob created by " + _backtrace);
                 }
 #endif
                 DoDispose();

src/Skia/Avalonia.Skia/PlatformRenderInterface.cs

@@ -28,7 +28,7 @@ namespace Avalonia.Skia
                 var iface = display.Type == GlDisplayType.OpenGL2
                     ? GRGlInterface.AssembleGlInterface((_, proc) => display.GlInterface.GetProcAddress(proc))
                     : GRGlInterface.AssembleGlesInterface((_, proc) => display.GlInterface.GetProcAddress(proc));
-                gl.ImmediateContext.MakeCurrent(null);
+                gl.ImmediateContext.MakeCurrent();
                 GrContext = GRContext.Create(GRBackend.OpenGL, iface);
             }
         }

src/Windows/Avalonia.Win32/FramebufferManager.cs

@@ -5,7 +5,7 @@ using Avalonia.Win32.Interop;
 
 namespace Avalonia.Win32
 {
-    class FramebufferManager : IFramebufferPlatformSurface, IDisposable
+    class FramebufferManager : IFramebufferPlatformSurface
     {
         private readonly IntPtr _hwnd;
         private WindowFramebuffer _fb;
@@ -29,10 +29,5 @@ namespace Avalonia.Win32
             }
             return _fb;
         }
-
-        public void Dispose()
-        {
-            _fb?.Deallocate();
-        }
     }
 }

src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs

@@ -780,8 +780,8 @@ namespace Avalonia.Win32.Interop
         [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLong")]
         private static extern uint SetWindowLong32b(IntPtr hWnd, int nIndex, uint value);
 
-        [DllImport("user32.dll", SetLastError = true)]
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLongPtr")]
-        private static extern uint SetWindowLongPtr(IntPtr hWnd, int nIndex, uint value);
+        private static extern IntPtr SetWindowLong64b(IntPtr hWnd, int nIndex, IntPtr value);
 
         public static uint SetWindowLong(IntPtr hWnd, int nIndex, uint value)
         {
@@ -791,7 +791,19 @@ namespace Avalonia.Win32.Interop
             }
             else
             {
-                return SetWindowLongPtr(hWnd, nIndex, value);
+                return (uint)SetWindowLong64b(hWnd, nIndex, new IntPtr((uint)value)).ToInt32();
+            }
+        }
+        
+        public static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr handle)
+        {
+            if (IntPtr.Size == 4)
+            {
+                return new IntPtr(SetWindowLong32b(hWnd, nIndex, (uint)handle.ToInt32()));
+            }
+            else
+            {
+                return SetWindowLong64b(hWnd, nIndex, handle);
             }
         }
 

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -27,11 +27,11 @@ namespace Avalonia
     {
         public static T UseWin32<T>(
             this T builder,
-            bool deferredRendering = true) 
+            bool deferredRendering = true, bool allowEgl = false) 
                 where T : AppBuilderBase<T>, new()
         {
             return builder.UseWindowingSubsystem(
-                () => Win32.Win32Platform.Initialize(deferredRendering),
+                () => Win32.Win32Platform.Initialize(deferredRendering, allowEgl),
                 "Win32");
         }
     }
@@ -66,7 +66,7 @@ namespace Avalonia.Win32
             Initialize(true);
         }
 
-        public static void Initialize(bool deferredRendering = true)
+        public static void Initialize(bool deferredRendering = true, bool allowEgl = false)
         {
             AvaloniaLocator.CurrentMutable
                 .Bind<IClipboard>().ToSingleton<ClipboardImpl>()
@@ -80,7 +80,8 @@ namespace Avalonia.Win32
                 .Bind<IWindowingPlatform>().ToConstant(s_instance)
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>()
                 .Bind<IPlatformIconLoader>().ToConstant(s_instance);
-            Win32GlManager.Initialize();
+            if (allowEgl)
+                Win32GlManager.Initialize();
             UseDeferredRendering = deferredRendering;
             _uiThread = Thread.CurrentThread;
 

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -13,6 +13,7 @@ using Avalonia.Input.Raw;
 using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Rendering;
+using Avalonia.Threading;
 using Avalonia.Win32.Input;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
@@ -42,6 +43,8 @@ namespace Avalonia.Win32
         private OleDropTarget _dropTarget;
         private Size _minSize;
         private Size _maxSize;
+        private WindowImpl _parent;
+        private readonly List<WindowImpl> _disabledBy = new List<WindowImpl>();
 
 #if USE_MANAGED_DRAG
         private readonly ManagedWindowResizeDragHelper _managedDrag;
@@ -165,10 +168,10 @@ namespace Avalonia.Win32
             private set;
         }
 
-        public bool IsEnabled
+
+        void UpdateEnabled()
         {
-            get { return UnmanagedMethods.IsWindowEnabled(_hwnd); }
+            EnableWindow(_hwnd, _disabledBy.Count == 0);
-            set { UnmanagedMethods.EnableWindow(_hwnd, value); }
         }
 
         public Size MaxClientSize
@@ -232,8 +235,6 @@ namespace Avalonia.Win32
 
         public void Dispose()
         {
-            _framebuffer?.Dispose();
-            _framebuffer = null;
             if (_hwnd != IntPtr.Zero)
             {
                 UnmanagedMethods.DestroyWindow(_hwnd);
@@ -248,6 +249,12 @@ namespace Avalonia.Win32
 
         public void Hide()
         {
+            if (_parent != null)
+            {
+                _parent._disabledBy.Remove(this);
+                _parent.UpdateEnabled();
+                _parent = null;
+            }
             UnmanagedMethods.ShowWindow(_hwnd, UnmanagedMethods.ShowWindowCommand.Hide);
         }
 
@@ -359,6 +366,7 @@ namespace Avalonia.Win32
 
         public virtual void Show()
         {
+            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, IntPtr.Zero);
             ShowWindow(_showWindowState);
         }
 
@@ -412,11 +420,13 @@ namespace Avalonia.Win32
             }
         }
 
-        public virtual IDisposable ShowDialog()
+        public void ShowDialog(IWindowImpl parent)
         {
-            Show();
+            _parent = (WindowImpl)parent;
-
+            _parent._disabledBy.Add(this);
-            return Disposable.Empty;
+            _parent.UpdateEnabled();
+            SetWindowLongPtr(_hwnd, (int)WindowLongParam.GWL_HWNDPARENT, ((WindowImpl)parent)._hwnd);
+            ShowWindow(_showWindowState);
         }
 
         public void SetCursor(IPlatformHandle cursor)
@@ -490,6 +500,11 @@ namespace Avalonia.Win32
                     //Remove root reference to this class, so unmanaged delegate can be collected
                     s_instances.Remove(this);
                     Closed?.Invoke();
+                    if (_parent != null)
+                    {
+                        _parent._disabledBy.Remove(this);
+                        _parent.UpdateEnabled();
+                    }
                     //Free other resources
                     Dispose();
                     return IntPtr.Zero;
@@ -633,7 +648,6 @@ namespace Avalonia.Win32
 
                 case UnmanagedMethods.WindowsMessage.WM_PAINT:
                     UnmanagedMethods.PAINTSTRUCT ps;
-
                     if (UnmanagedMethods.BeginPaint(_hwnd, out ps) != IntPtr.Zero)
                     {
                         var f = Scaling;

tests/Avalonia.Controls.UnitTests/CursorFactoryMock.cs

@@ -0,0 +1,14 @@
+using System;
+using Avalonia.Input;
+using Avalonia.Platform;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class CursorFactoryMock : IStandardCursorFactory
+    {
+        public IPlatformHandle GetCursor(StandardCursorType cursorType)
+        {
+            return new PlatformHandle(IntPtr.Zero, cursorType.ToString());
+        }
+    }
+}

tests/Avalonia.Controls.UnitTests/LayoutTransformControlTests.cs

@@ -1,6 +1,4 @@
-using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Shapes;
-using Avalonia.Controls.Templates;
 using Avalonia.Media;
 using Xunit;
 
@@ -311,20 +309,10 @@ namespace Avalonia.Controls.UnitTests
         {
             var lt = new LayoutTransformControl()
             {
-                LayoutTransform = transform,
+                LayoutTransform = transform
-                Template = new FuncControlTemplate<LayoutTransformControl>(
-                                p => new ContentPresenter() { Content = p.Content })
             };
 
-            lt.Content = new Rectangle() { Width = width, Height = height };
+            lt.Child = new Rectangle() { Width = width, Height = height };
-
-            lt.ApplyTemplate();
-
-            //we need to force create visual child
-            //so the measure after is correct
-            (lt.Presenter as ContentPresenter).UpdateChild();
-
-            Assert.NotNull(lt.Presenter?.Child);
 
             lt.Measure(Size.Infinity);
             lt.Arrange(new Rect(lt.DesiredSize));

tests/Avalonia.Controls.UnitTests/TabControlTests.cs

@@ -22,7 +22,7 @@ namespace Avalonia.Controls.UnitTests
             TabItem selected;
             var target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 Items = new[]
                 {
                     (selected = new TabItem
@@ -61,7 +61,7 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 Items = items,
             };
 
@@ -94,7 +94,7 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 Items = collection,
             };
 
@@ -147,7 +147,7 @@ namespace Avalonia.Controls.UnitTests
                     },
                     Child = new TabControl
                     {
-                        Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                        Template = TabControlTemplate(),
                         Items = collection,
                     }
                 };
@@ -172,7 +172,7 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 DataContext = "Base",
                 DataTemplates =
                 {
@@ -182,41 +182,39 @@ namespace Avalonia.Controls.UnitTests
             };
 
             ApplyTemplate(target);
-            var carousel = (Carousel)target.Pages;
 
-            var container = (ContentPresenter)carousel.Presenter.Panel.Children.Single();
+            target.ContentPart.UpdateChild();
-            container.UpdateChild();
+            var dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
-            var dataContext = ((TextBlock)container.Child).DataContext;
             Assert.Equal(items[0], dataContext);
 
             target.SelectedIndex = 1;
-            container = (ContentPresenter)carousel.Presenter.Panel.Children.Single();
+            target.ContentPart.UpdateChild();
-            container.UpdateChild();
+            dataContext = ((Button)target.ContentPart.Child).DataContext;
-            dataContext = ((Button)container.Child).DataContext;
             Assert.Equal(items[1], dataContext);
 
             target.SelectedIndex = 2;
-            dataContext = ((TextBlock)carousel.Presenter.Panel.Children.Single()).DataContext;
+            target.ContentPart.UpdateChild();
+            dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
             Assert.Equal("Base", dataContext);
 
             target.SelectedIndex = 3;
-            container = (ContentPresenter)carousel.Presenter.Panel.Children[0];
+            target.ContentPart.UpdateChild();
-            container.UpdateChild();
+            dataContext = ((TextBlock)target.ContentPart.Child).DataContext;
-            dataContext = ((TextBlock)container.Child).DataContext;
             Assert.Equal("Qux", dataContext);
 
             target.SelectedIndex = 4;
-            dataContext = ((TextBlock)carousel.Presenter.Panel.Children.Single()).DataContext;
+            target.ContentPart.UpdateChild();
+            dataContext = target.ContentPart.DataContext;
             Assert.Equal("Base", dataContext);
         }
 
         /// <summary>
-        /// Non-headered control items should result in TabStripItems with empty content.
+        /// Non-headered control items should result in TabItems with empty header.
         /// </summary>
         /// <remarks>
-        /// If a TabStrip is created with non IHeadered controls as its items, don't try to
+        /// If a TabControl is created with non IHeadered controls as its items, don't try to
-        /// display the control in the TabStripItem: if the TabStrip is part of a TabControl
+        /// display the control in the header: if the control is part of the header then
-        /// then *that* will also try to display the control, resulting in dual-parentage 
+        /// *that* control would also end up in the content region, resulting in dual-parentage 
         /// breakage.
         /// </remarks>
         [Fact]
@@ -230,18 +228,20 @@ namespace Avalonia.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 Items = items,
             };
 
             ApplyTemplate(target);
 
-            var result = target.TabStrip.GetLogicalChildren()
+            var logicalChildren = target.ItemsPresenterPart.Panel.GetLogicalChildren();
-                .OfType<TabStripItem>()
+
-                .Select(x => x.Content)
+            var result = logicalChildren
+                .OfType<TabItem>()
+                .Select(x => x.Header)
                 .ToList();
 
-            Assert.Equal(new object[] { string.Empty, string.Empty }, result);
+            Assert.Equal(new object[] { null, null }, result);
         }
 
         [Fact]
@@ -249,7 +249,7 @@ namespace Avalonia.Controls.UnitTests
         {
             TabControl target = new TabControl
             {
-                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = TabControlTemplate(),
                 Items = new[]
                 {
                     new TabItem { Header = "Foo" },
@@ -262,70 +262,61 @@ namespace Avalonia.Controls.UnitTests
 
             target.SelectedIndex = 2;
 
-            var carousel = (Carousel)target.Pages;
+            var page = (TabItem)target.SelectedItem;
-            var page = (TabItem)carousel.SelectedItem;
 
             Assert.Null(page.Content);
         }
 
-        private Control CreateTabControlTemplate(TabControl parent)
+        private IControlTemplate TabControlTemplate()
         {
-            return new StackPanel
+            return new FuncControlTemplate<TabControl>(parent =>
-            {
-                Children =
-                {
-                    new TabStrip
-                    {
-                        Name = "PART_TabStrip",
-                        Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
-                        MemberSelector = TabControl.HeaderSelector,
-                        [!TabStrip.ItemsProperty] = parent[!TabControl.ItemsProperty],
-                        [!!TabStrip.SelectedIndexProperty] = parent[!!TabControl.SelectedIndexProperty]
-                    },
-                    new Carousel
-                    {
-                        Name = "PART_Content",
-                        Template = new FuncControlTemplate<Carousel>(CreateCarouselTemplate),
-                        MemberSelector = TabControl.ContentSelector,
-                        [!Carousel.ItemsProperty] = parent[!TabControl.ItemsProperty],
-                        [!Carousel.SelectedItemProperty] = parent[!TabControl.SelectedItemProperty],
-                    }
-                }
-            };
-        }
 
-        private Control CreateTabStripTemplate(TabStrip parent)
+                new StackPanel
-        {
+                {
-            return new ItemsPresenter
+                    Children = {
-            {
+                                   new ItemsPresenter
-                Name = "PART_ItemsPresenter",
+                                   {
-                [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
+                                       Name = "PART_ItemsPresenter",
-                [!CarouselPresenter.MemberSelectorProperty] = parent[!ItemsControl.MemberSelectorProperty],
+                                       [!TabStrip.ItemsProperty] = parent[!TabControl.ItemsProperty],
-            };
+                                       [!TabStrip.ItemTemplateProperty] = parent[!TabControl.ItemTemplateProperty],
+                                   },
+                                   new ContentPresenter
+                                   {
+                                       Name = "PART_Content",
+                                       [!ContentPresenter.ContentProperty] = parent[!TabControl.SelectedContentProperty],
+                                       [!ContentPresenter.ContentTemplateProperty] = parent[!TabControl.SelectedContentTemplateProperty],
+                                   }
+                               }
+                });
         }
 
-        private Control CreateCarouselTemplate(Carousel control)
+        private IControlTemplate TabItemTemplate()
         {
-            return new CarouselPresenter
+            return new FuncControlTemplate<TabItem>(parent =>
-            {
+                new ContentPresenter
-                Name = "PART_ItemsPresenter",
+                {
-                [!CarouselPresenter.ItemsProperty] = control[!ItemsControl.ItemsProperty],
+                    Name = "PART_ContentPresenter",
-                [!CarouselPresenter.ItemsPanelProperty] = control[!ItemsControl.ItemsPanelProperty],
+                    [!ContentPresenter.ContentProperty] = parent[!TabItem.HeaderProperty],
-                [!CarouselPresenter.MemberSelectorProperty] = control[!ItemsControl.MemberSelectorProperty],
+                    [!ContentPresenter.ContentTemplateProperty] = parent[!TabItem.HeaderTemplateProperty]
-                [!CarouselPresenter.SelectedIndexProperty] = control[!SelectingItemsControl.SelectedIndexProperty],
+                });
-                [~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty],
-            };
         }
 
         private void ApplyTemplate(TabControl target)
         {
             target.ApplyTemplate();
-            var carousel = (Carousel)target.Pages;
+
-            carousel.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
-            carousel.Presenter.ApplyTemplate();
+
-            var tabStrip = (TabStrip)target.TabStrip;
+            foreach (var tabItem in target.GetLogicalChildren().OfType<TabItem>())
-            tabStrip.ApplyTemplate();
+            {
-            tabStrip.Presenter.ApplyTemplate();
+                tabItem.Template = TabItemTemplate();
+
+                tabItem.ApplyTemplate();
+
+                ((ContentPresenter)tabItem.Presenter).UpdateChild();
+            }
+
+            target.ContentPart.ApplyTemplate();
         }
 
         private class Item

tests/Avalonia.Controls.UnitTests/ViewboxTests.cs

@@ -0,0 +1,105 @@
+using Avalonia.Controls.Shapes;
+using Avalonia.Media;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class ViewboxTests
+    {
+        [Fact]
+        public void Viewbox_Stretch_Uniform_Child()
+        {
+            var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(200, 100), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(2.0, scaleTransform.ScaleX);
+            Assert.Equal(2.0, scaleTransform.ScaleY);
+        }
+
+        [Fact]
+        public void Viewbox_Stretch_None_Child()
+        {
+            var target = new Viewbox() { Stretch = Stretch.None, Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(100, 50), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(1.0, scaleTransform.ScaleX);
+            Assert.Equal(1.0, scaleTransform.ScaleY);
+        }
+
+        [Fact]
+        public void Viewbox_Stretch_Fill_Child()
+        {
+            var target = new Viewbox() { Stretch = Stretch.Fill, Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(200, 200), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(2.0, scaleTransform.ScaleX);
+            Assert.Equal(4.0, scaleTransform.ScaleY);
+        }
+
+        [Fact]
+        public void Viewbox_Stretch_UniformToFill_Child()
+        {
+            var target = new Viewbox() { Stretch = Stretch.UniformToFill, Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(200, 200));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(200, 200), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(4.0, scaleTransform.ScaleX);
+            Assert.Equal(4.0, scaleTransform.ScaleY);
+        }
+
+        [Fact]
+        public void Viewbox_Stretch_Uniform_Child_With_Unrestricted_Width()
+        {
+            var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(double.PositiveInfinity, 200));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(400, 200), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(4.0, scaleTransform.ScaleX);
+            Assert.Equal(4.0, scaleTransform.ScaleY);
+        }
+
+        [Fact]
+        public void Viewbox_Stretch_Uniform_Child_With_Unrestricted_Height()
+        {
+            var target = new Viewbox() { Child = new Rectangle() { Width = 100, Height = 50 } };
+
+            target.Measure(new Size(200, double.PositiveInfinity));
+            target.Arrange(new Rect(new Point(0, 0), target.DesiredSize));
+
+            Assert.Equal(new Size(200, 100), target.DesiredSize);
+            var scaleTransform = target.Child.RenderTransform as ScaleTransform;
+
+            Assert.NotNull(scaleTransform);
+            Assert.Equal(2.0, scaleTransform.ScaleX);
+            Assert.Equal(2.0, scaleTransform.ScaleY);
+        }
+    }
+}

tests/Avalonia.Controls.UnitTests/WindowTests.cs

@@ -62,9 +62,11 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
+                var parent = new Window();
+                parent.Show();
                 var window = new Window();
 
-                var task = window.ShowDialog();
+                var task = window.ShowDialog(parent);
 
                 Assert.True(window.IsVisible);
             }
@@ -258,12 +260,13 @@ namespace Avalonia.Controls.UnitTests
         {
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
+                var parent = new Mock<IWindowImpl>();
                 var windowImpl = new Mock<IWindowImpl>();
                 windowImpl.SetupProperty(x => x.Closed);
                 windowImpl.Setup(x => x.Scaling).Returns(1);
 
                 var target = new Window(windowImpl.Object);
-                var task = target.ShowDialog<bool>();
+                var task = target.ShowDialog<bool>(parent.Object);
 
                 windowImpl.Object.Closed();
 

tests/Avalonia.Layout.UnitTests/FullLayoutTests.cs

@@ -21,6 +21,7 @@ using Xunit;
 using Avalonia.Media;
 using System;
 using System.Collections.Generic;
+using Avalonia.Controls.UnitTests;
 using Avalonia.UnitTests;
 
 namespace Avalonia.Layout.UnitTests
@@ -98,6 +99,8 @@ namespace Avalonia.Layout.UnitTests
                     }
                 };
 
+                window.Resources["ScrollBarThickness"] = 10.0;
+
                 window.Show();
                 window.LayoutManager.ExecuteInitialLayoutPass(window);
 
@@ -197,6 +200,7 @@ namespace Avalonia.Layout.UnitTests
             windowImpl.SetupGet(x => x.Scaling).Returns(1);
 
             AvaloniaLocator.CurrentMutable
+                .Bind<IStandardCursorFactory>().ToConstant(new CursorFactoryMock())
                 .Bind<IAssetLoader>().ToConstant(new AssetLoader())
                 .Bind<IInputManager>().ToConstant(new Mock<IInputManager>().Object)
                 .Bind<IGlobalStyles>().ToConstant(globalStyles.Object)

tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs

@@ -1,9 +1,13 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
+using Avalonia.Markup.Parsers;
 using Avalonia.UnitTests;
 using Xunit;
 
@@ -162,5 +166,99 @@ namespace Avalonia.Markup.UnitTests.Data
             decorator2.Child = target;
             Assert.Equal("decorator2", target.Text);
         }
+
+        [Fact]
+        public void Should_Update_When_Detached_And_Attached_To_Visual_Tree_With_BindingPath()
+        {
+            TextBlock target;
+            Decorator decorator1;
+            Decorator decorator2;
+
+            var viewModel = new { Value = "Foo" };
+
+            var root1 = new TestRoot
+            {
+                Child = decorator1 = new Decorator
+                {
+                    Name = "decorator1",
+                    Child = target = new TextBlock(),
+                },
+                DataContext = viewModel
+            };
+
+            var root2 = new TestRoot
+            {
+                Child = decorator2 = new Decorator
+                {
+                    Name = "decorator2",
+                },
+                DataContext = viewModel
+            };
+
+            var binding = new Binding
+            {
+                Path = "DataContext.Value",
+                RelativeSource = new RelativeSource
+                {
+                    AncestorType = typeof(Decorator),
+                }
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+            Assert.Equal("Foo", target.Text);
+
+            decorator1.Child = null;
+            Assert.Null(target.Text);
+
+            decorator2.Child = target;
+            Assert.Equal("Foo", target.Text);
+        }
+
+        [Fact]
+        public void Should_Update_When_Detached_And_Attached_To_Visual_Tree_With_ComplexBindingPath()
+        {
+            TextBlock target;
+            Decorator decorator1;
+            Decorator decorator2;
+
+            var vm = new { Foo = new  { Value = "Foo" } };
+
+            var root1 = new TestRoot
+            {
+                Child = decorator1 = new Decorator
+                {
+                    Name = "decorator1",
+                    Child = target = new TextBlock(),
+                },
+                DataContext = vm
+            };
+
+            var root2 = new TestRoot
+            {
+                Child = decorator2 = new Decorator
+                {
+                    Name = "decorator2",
+                },
+                DataContext = vm
+            };
+
+            var binding = new Binding
+            {
+                Path = "DataContext.Foo.Value",
+                RelativeSource = new RelativeSource
+                {
+                    AncestorType = typeof(Decorator),
+                }
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+            Assert.Equal("Foo", target.Text);
+
+            decorator1.Child = null;
+            Assert.Null(target.Text);
+
+            decorator2.Child = target;
+            Assert.Equal("Foo", target.Text);
+        }
     }
 }

tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Property.cs

@@ -1,10 +1,10 @@
-using Avalonia.Data;
+using System;
-using Avalonia.Markup.Parsers;
-using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
-using System.Text;
+using System.Reactive.Subjects;
 using System.Threading.Tasks;
+using Avalonia.Data;
+using Avalonia.Markup.Parsers;
 using Xunit;
 
 namespace Avalonia.Markup.UnitTests.Parsers
@@ -38,5 +38,55 @@ namespace Avalonia.Markup.UnitTests.Parsers
 
             GC.KeepAlive(data);
         }
+
+        [Fact]
+        public void Should_Update_Value_After_Root_Changes()
+        {
+            var root = new { DataContext = new { Value = "Foo" } };
+            var subject = new Subject<object>();
+            var obs = ExpressionObserverBuilder.Build(subject, "DataContext.Value");
+
+            var values = new List<object>();
+            obs.Subscribe(v => values.Add(v));
+
+            subject.OnNext(root);
+            subject.OnNext(null);
+            subject.OnNext(root);
+
+            Assert.Equal("Foo", values[0]);
+
+            Assert.IsType<BindingNotification>(values[1]);
+            var bn = values[1] as BindingNotification;
+            Assert.Equal(AvaloniaProperty.UnsetValue, bn.Value);
+            Assert.Equal(BindingErrorType.Error, bn.ErrorType);
+
+            Assert.Equal(3, values.Count);
+            Assert.Equal("Foo", values[2]);
+        }
+
+        [Fact]
+        public void Should_Update_Value_After_Root_Changes_With_ComplexPath()
+        {
+            var root = new { DataContext = new { Foo = new { Value = "Foo" } } };
+            var subject = new Subject<object>();
+            var obs = ExpressionObserverBuilder.Build(subject, "DataContext.Foo.Value");
+
+            var values = new List<object>();
+            obs.Subscribe(v => values.Add(v));
+
+            subject.OnNext(root);
+            subject.OnNext(null);
+            subject.OnNext(root);
+
+            Assert.Equal("Foo", values[0]);
+
+            Assert.IsType<BindingNotification>(values[1]);
+            var bn = values[1] as BindingNotification;
+            Assert.Equal(AvaloniaProperty.UnsetValue, bn.Value);
+            Assert.Equal(BindingErrorType.Error, bn.ErrorType);
+
+            Assert.Equal(3, values.Count);
+            Assert.Equal("Foo", values[2]);
+        }
     }
 }

tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs

@@ -406,6 +406,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 root.Measure(Size.Infinity);
                 root.Arrange(new Rect(container.DesiredSize));
                 
+                root.Renderer.Paint(Rect.Empty);
                 var result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
 
                 Assert.Equal(item1, result);
@@ -421,6 +422,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
                 container.InvalidateArrange();
                 container.Arrange(new Rect(container.DesiredSize));
 
+                root.Renderer.Paint(Rect.Empty);
                 result = root.Renderer.HitTest(new Point(50, 150), root, null).First();
                 Assert.Equal(item2, result);