Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vs2013 theme improvement #284

Merged
merged 8 commits into from
Aug 9, 2021
Merged

Vs2013 theme improvement #284

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d16dd36
Created test project.
oktrue Jun 22, 2021
3426f40
Preparing demo project.
oktrue Jun 22, 2021
87d1aaf
Added extended themes.
oktrue Jun 23, 2021
882760e
Added extended theme colors.
oktrue Jun 24, 2021
2d17189
Fixed some margins.
oktrue Jun 24, 2021
f033060
Updated layout. Added new tools.
oktrue Jun 25, 2021
a57c142
Added MLib dependency. Fixed caption height.
oktrue Jun 26, 2021
74aba42
VS2013 theme update. Fixed interaction with document in VS2013Test pr…
oktrue Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed some margins.
  • Loading branch information
@oktrue
oktrue committed Jun 24, 2021
commit 2d17189c960ee6ab4ff2dbc19f825094af875783
20 changes: 14 additions & 6 deletions source/VS2013Test/Views/MainView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:viewModels="clr-namespace:AvalonDock.VS2013Test.ViewModels"
xmlns:icons="clr-namespace:VS2013Test.Icons"
mc:Ignorable="d"
Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" UseLayoutRounding="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">
Title="VS2013Test" MinWidth="140" MinHeight="34" MaxWidth="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" MaxHeight="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" Height="720" Width="1280" SnapsToDevicePixels="True" Foreground="{DynamicResource WindowForeground}" Background="{DynamicResource HeaderBackground}" WindowStyle="None" ResizeMode="CanResize">

<Window.DataContext>
<viewModels:Workspace/>
Expand All @@ -25,9 +25,6 @@
<Trigger Property="IsActive" Value="False">
<Setter Property="BorderBrush" Value="{DynamicResource WindowInactiveBorderBrush}"/>
</Trigger>
<Trigger Property="WindowState" Value="Maximized">
<Setter Property="BorderThickness" Value="0" />
</Trigger>
</Style.Triggers>
</Style>
</Window.Style>
Expand All @@ -37,7 +34,7 @@
<Style TargetType="{x:Type Grid}">
<Style.Triggers>
<DataTrigger Binding="{Binding WindowState, RelativeSource={RelativeSource AncestorType=Window}}" Value="Maximized">
<Setter Property="Margin" Value="7,7,7,9" />
<Setter Property="Margin" Value="6,6,6,8" />
</DataTrigger>
</Style.Triggers>
</Style>
Expand Down Expand Up @@ -200,7 +197,18 @@

<Border Grid.Row="2" Height="23" Background="{DynamicResource StatusBarBackground}">
<Grid>
<TextBlock Text="Ready" Foreground="{DynamicResource StatusBarForeground}" VerticalAlignment="Center" Margin="6,0" />
<StackPanel Orientation="Horizontal">
<Path Stroke="White" StrokeThickness="1" VerticalAlignment="Bottom" Margin="7.5,0,8,5">
<Path.Data>
<RectangleGeometry Rect="0,0,12,10"/>
</Path.Data>
<Path.RenderTransform>
<SkewTransform AngleX="-15">
</SkewTransform>
</Path.RenderTransform>
</Path>
<TextBlock Text="Ready" Foreground="{DynamicResource StatusBarForeground}" VerticalAlignment="Center" Margin="0,0,6,1" />
</StackPanel>
</Grid>
</Border>
</Grid>
Expand Down