michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2025-01-10 23:47:21 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style<Launcher>: remove ShadowEffect for tabs in titlebar；change color for light theme

Browse source
This commit is contained in:
leo 2020-12-17 14:27:50 +08:00
parent bdd979eb58
commit bb1c98917e
3 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Resources/Themes/Light.xaml
View file

@ -1,11 +1,11 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="Brush.BG1" Color="#FFEEEEF2"/> <SolidColorBrush x:Key="Brush.BG1" Color="#FFDFDFDF"/>
<SolidColorBrush x:Key="Brush.BG2" Color="White"/> <SolidColorBrush x:Key="Brush.BG2" Color="White"/>
<SolidColorBrush x:Key="Brush.BG3" Color="WhiteSmoke"/> <SolidColorBrush x:Key="Brush.BG3" Color="WhiteSmoke"/>
<SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/> <SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/>
<SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/> <SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/>
<SolidColorBrush x:Key="Brush.BG6" Color="#FFCFCFCF"/> <SolidColorBrush x:Key="Brush.BG6" Color="#FFFFFFFF"/>
<SolidColorBrush x:Key="Brush.BG7" Color="#FF836C2E"/> <SolidColorBrush x:Key="Brush.BG7" Color="#FF836C2E"/>
<SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/> <SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/>
<SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/> <SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/>

3
src/UI/Dashboard.xaml
View file

@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:source="clr-namespace:SourceGit"
xmlns:local="clr-namespace:SourceGit.UI" xmlns:local="clr-namespace:SourceGit.UI"
xmlns:converters="clr-namespace:SourceGit.Converters" xmlns:converters="clr-namespace:SourceGit.Converters"
mc:Ignorable="d" mc:Ignorable="d"
@ -32,7 +31,7 @@
<!-- TitleBar --> <!-- TitleBar -->
<Grid Grid.Row="0" Panel.ZIndex="100"> <Grid Grid.Row="0" Panel.ZIndex="100">
<Border Background="{StaticResource Brush.BG1}" Margin="0,16,0,0"> <Border Background="{StaticResource Brush.BG1}" Margin="0,4,0,0">
<Border.Effect> <Border.Effect>
<DropShadowEffect ShadowDepth="2" Direction="270" Opacity=".5" Color="Black"/> <DropShadowEffect ShadowDepth="2" Direction="270" Opacity=".5" Color="Black"/>
</Border.Effect> </Border.Effect>

17
src/UI/Launcher.xaml
View file

@ -50,12 +50,6 @@
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="3" VerticalAlignment="Bottom" Margin="0,0,0,-1" Height="1" Background="{StaticResource Brush.BG1}">
<Border.Effect>
<DropShadowEffect ShadowDepth="0" Opacity="1"/>
</Border.Effect>
</Border>
<!-- Tabs --> <!-- Tabs -->
<ScrollViewer x:Name="openedTabsScroller" Grid.Column="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled"> <ScrollViewer x:Name="openedTabsScroller" Grid.Column="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled">
<TabControl x:Name="openedTabs" Padding="0" SnapsToDevicePixels="True" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged"> <TabControl x:Name="openedTabs" Padding="0" SnapsToDevicePixels="True" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged">
@ -140,11 +134,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type TabItem}"> <ControlTemplate TargetType="{x:Type TabItem}">
<Grid SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True" ToolTip="{Binding Tooltip}"> <Grid SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True" ToolTip="{Binding Tooltip}">
<Border x:Name="BG" Margin="-1,0" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0"> <Border x:Name="BG" Margin="-1,0" SnapsToDevicePixels="True" Background="Transparent" CornerRadius="4,4,0,0"/>
<Border.Effect>
<DropShadowEffect ShadowDepth="0" Opacity=".7"/>
</Border.Effect>
</Border>
<Rectangle <Rectangle
x:Name="Splitter" x:Name="Splitter"
@ -182,8 +172,7 @@
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True"> <Trigger Property="IsSelected" Value="True">
<Setter Property="Panel.ZIndex" Value="2"/> <Setter Property="Panel.ZIndex" Value="2"/>
<Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG1}"/> <Setter TargetName="BG" Property="Background" Value="{StaticResource Brush.BG1}"/>
<Setter TargetName="BG" Property="BorderThickness" Value="1,1,1,0"/>
<Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG1}"/> <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG1}"/>
<Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG1}"/> <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG1}"/>
</Trigger> </Trigger>
@ -198,7 +187,7 @@
<Condition Property="IsMouseOver" Value="True"/> <Condition Property="IsMouseOver" Value="True"/>
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter Property="Panel.ZIndex" Value="1"/> <Setter Property="Panel.ZIndex" Value="1"/>
<Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG5}"/> <Setter TargetName="BG" Property="Background" Value="{StaticResource Brush.BG5}"/>
<Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG5}"/> <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG5}"/>
<Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG5}"/> <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG5}"/>
</MultiTrigger> </MultiTrigger>