8000 Merge branch 'master' into fixes/1271-checkout-with-untracked-files · github/VisualStudio@0174773 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 0174773

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into fixes/1271-checkout-with-untracked-files
2 parents b5256bc + 166cdc0 commit 0174773

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

‎install.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Configuration=%1
2-
@set path=%cd%\tools\VsixUtil;%path%
1+
@set Configuration=%1
2+
@if "%Configuration%" == "" echo Please specify Debug or Release
33
tools\VsixUtil\vsixutil /install "build\%Configuration%\GitHub.VisualStudio.vsix"
44
@echo Installed %Configuration% build of GitHub for Visual Studio

‎src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4-
using System.ComponentModel;
54
using System.Linq;
65
using System.Reactive.Linq;
76
using System.Threading.Tasks;
87
using GitHub.Extensions;
9-
using GitHub.InlineReviews.Services;
108
using GitHub.Logging;
119
using GitHub.Models;
1210
using GitHub.Services;
13-
using GitHub.VisualStudio;
1411
using Microsoft.VisualStudio.Text;
1512
using Microsoft.VisualStudio.Text.Editor;
1613
using Microsoft.VisualStudio.Text.Tagging;
@@ -50,7 +47,7 @@ public InlineCommentTagger(
5047
this.sessionManager = sessionManager;
5148
}
5249

53-
public bool ShowMargin => file != null;
50+
public bool ShowMargin => file?.Diff?.Count > 0;
5451

5552
public event EventHandler<SnapshotSpanEventArgs> TagsChanged;
5653

‎src/GitHub.VisualStudio.UI/Styles/SectionControl.xaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,28 @@
2323
<ToggleButton Grid.Column="0" Grid.Row="0"
2424
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
2525
VerticalAlignment="Stretch"
26-
Width="16">
26+
Margin="0 0 4 0"
27+
Width="10">
2728
<ToggleButton.Template>
2829
<ControlTemplate TargetType="ToggleButton">
29-
<Border Background="Transparent" >
30+
<Border Background="Transparent">
3031
<Path Name="Arrow"
31-
Fill="{TemplateBinding Foreground}"
32+
Fill="{DynamicResource VsBrush.WindowText}"
33+
Height="7"
34+
Width="7"
35+
Stretch="UniformToFill"
36+
Data="M7 1l-.025 5H2z"
3237
VerticalAlignment="Center"
3338
HorizontalAlignment="Center"/>
3439
</Border>
40+
3541
<ControlTemplate.Triggers>
36-
<Trigger Property="IsChecked" Value="True">
37-
<Setter TargetName="Arrow" Property="Data" Value="M 0 0 L 4 4 L 8 0 Z" />
38-
</Trigger>
3942
<Trigger Property="IsChecked" Value="False">
40-
<Setter TargetName="Arrow" Property="Data" Value="M 0 4 L 4 0 L 8 4 Z" />
43+
<Setter TargetName="Arrow" Property="LayoutTransform">
44+
<Setter.Value>
45+
<RotateTransform Angle="-45" />
46+
</Setter.Value>
47+
</Setter>
4148
</Trigger>
4249
</ControlTemplate.Triggers>
4350
</ControlTemplate>

0 commit comments

Comments
 (0)
0