From 8bc23a7d71ff62f2d9eb558eb4f2af26f0abf272 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Aug 2020 23:40:23 +0800
Subject: [PATCH] fix(*): show special characters, like '-', '_', etc, in local
 branches; App.RaiseError crashes when called in other threads except UI.

---
 src/App.xaml.cs       |  5 +++--
 src/UI/Dashboard.xaml |  6 ++++--
 src/UI/Launcher.xaml  | 45 +++++++++++++++++++++----------------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/App.xaml.cs b/src/App.xaml.cs
index 0636a298..da11692a 100644
--- a/src/App.xaml.cs
+++ b/src/App.xaml.cs
@@ -33,8 +33,9 @@ namespace SourceGit {
         /// </summary>
         /// <param name="message"></param>
         public static void RaiseError(string msg) {
-            var main = Current.MainWindow as UI.Launcher;
-            main.Dispatcher.Invoke(() => main.Errors.Add(msg));
+            Current.Dispatcher.Invoke(() => {
+                (Current.MainWindow as UI.Launcher).Errors.Add(msg);
+            });
         }
 
         /// <summary>
diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index 0afc3c17..bbde65c4 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -32,7 +32,7 @@
         
         <!-- TitleBar -->
         <Grid Grid.Row="0" Panel.ZIndex="100">
-            <Border Background="{StaticResource Brush.BG1}" Margin="0,2,0,0">
+            <Border Background="{StaticResource Brush.BG1}" Margin="0,16,0,0">
                 <Border.Effect>
                     <DropShadowEffect ShadowDepth="2" Direction="270" Opacity=".5" Color="Black"/>
                 </Border.Effect>
@@ -210,6 +210,8 @@
                     Padding="0"
                     Background="{StaticResource Brush.BG3}"
                     FontFamily="Consolas"
+                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollBarVisibility="Auto"
                     LostFocus="TreeLostFocus"
                     SelectedItemChanged="LocalBranchSelected"
                     PreviewMouseWheel="TreeMouseWheel">
@@ -230,7 +232,7 @@
                                 </Grid.ColumnDefinitions>
 
                                 <Path Grid.Column="0" Width="10" x:Name="icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
-                                <Label Grid.Column="1" x:Name="name" Content="{Binding Name}" Padding="4,0,0,0"/>
+                                <TextBlock Grid.Column="1" x:Name="name" Text="{Binding Name}" Padding="4,0,0,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG}" ClipToBounds="True"/>
                                 <StackPanel Grid.Column="2" Orientation="Horizontal">
                                     <Border Style="{StaticResource Style.Border.Badge}" Visibility="{Binding TrackVisibility}">
                                         <Label Margin="4,-2,4,-2" Content="{Binding Branch.UpstreamTrack}" FontSize="10"/>
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index eb938c88..28011750 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -35,7 +35,7 @@
         </Border.Style>
         
         <!-- Window Content -->
-        <Grid>
+        <Grid Background="{StaticResource Brush.BG1}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
                 <RowDefinition Height="*"/>
@@ -50,21 +50,18 @@
 
                 <!-- Tabs -->
                 <ScrollViewer x:Name="openedTabsScroller" Grid.Column="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled">
-                    <TabControl x:Name="openedTabs" Padding="0" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged">
+                    <TabControl x:Name="openedTabs" Padding="0" SnapsToDevicePixels="True" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged">
                         <TabControl.Style>
                             <Style TargetType="{x:Type TabControl}">
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="{x:Type TabControl}">
-                                            <Grid KeyboardNavigation.TabNavigation="Local" Height="32">
-                                                <StackPanel Orientation="Horizontal"
-                                                    x:Name="HeaderPanel" 
-                                                    Grid.Row="0" 
-                                                    Margin="6,4,0,0" 
-                                                    IsItemsHost="True" 
-                                                    KeyboardNavigation.TabIndex="1" 
-                                                    Background="Transparent" />
-                                            </Grid>
+                                            <StackPanel Orientation="Horizontal"                                                    
+                                                        x:Name="HeaderPanel"
+                                                        Margin="6,4,0,0"
+                                                        IsItemsHost="True"
+                                                        SnapsToDevicePixels="True"
+                                                        KeyboardNavigation.TabIndex="1"/>
                                         </ControlTemplate>
                                     </Setter.Value>
                                 </Setter>
@@ -75,11 +72,13 @@
                             <Style TargetType="{x:Type TabItem}">
                                 <Setter Property="AllowDrop" Value="True"/>
                                 <Setter Property="IsSelected" Value="{Binding IsActive, Mode=TwoWay}"/>
+                                <Setter Property="Margin" Value="0"/>
+                                <Setter Property="Padding" Value="0"/>
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="{x:Type TabItem}">
-                                            <Grid x:Name="Container" Opacity=".7" Height="28" WindowChrome.IsHitTestVisibleInChrome="True">
-                                                <Border x:Name="BG" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
+                                            <Grid x:Name="Container" Opacity=".7" SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True">
+                                                <Border x:Name="BG" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
                                                     <Border.Effect>
                                                         <DropShadowEffect ShadowDepth="2" Direction="30" Color="Black" Opacity=".3"/>
                                                     </Border.Effect>
@@ -87,24 +86,24 @@
 
                                                 <Path
                                                     x:Name="CornerLeft"
-                                                    Width="4"
-                                                    Height="4"
+                                                    Width="6"
+                                                    Height="6"
                                                     HorizontalAlignment="Left"
                                                     VerticalAlignment="Bottom"
-                                                    Margin="-4,0,0,0"
-                                                    Data="M 0,4 L 4,4 4,0 C 4,0 4,4 0,4 Z"
+                                                    Margin="-5,0,0,0"
+                                                    Data="M 0,6 L 6,6 6,0 C 6,0 6,6 0,6 Z"
                                                     Fill="Transparent"/>
 
                                                 <Path
                                                     x:Name="CornerRight"
-                                                    Width="4"
-                                                    Height="4"
+                                                    Width="6"
+                                                    Height="6"
                                                     HorizontalAlignment="Right"
                                                     VerticalAlignment="Bottom"
-                                                    Margin="0,0,-4,0"
-                                                    Data="M 0,0 L 0,4 4,4 C 4,4 0,4 0,0 Z"
+                                                    Margin="0,0,-5,0"
+                                                    Data="M 0,0 L 0,6 6,6 C 6,6 0,6 0,0 Z"
                                                     Fill="Transparent"/>
-
+                                                
                                                 <ContentPresenter 
                                                     x:Name="ContentSite" 
                                                     VerticalAlignment="Center" HorizontalAlignment="Center" 
@@ -141,7 +140,7 @@
 
                         <TabControl.ItemTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Margin="6,0">
+                                <StackPanel Orientation="Horizontal" Margin="6,0" VerticalAlignment="Center">
                                     <Path Grid.Column="0" Width="14" Height="14" x:Name="Icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}"/>
                                     <TextBlock Grid.Column="1" Text="{Binding Title}" Foreground="{StaticResource Brush.FG}" Margin="8,0,0,0" FontWeight="Bold">
                                         <TextBlock.ToolTip>