Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 2130ed1

Browse files
jcansdalejcansdale
committed
Fix the HorizontalShadowDivider theme
1 parent 66e5dae commit 2130ed1

File tree

10 files changed

+23
-178
lines changed

10 files changed

+23
-178
lines changed

‎src/GitHub.UI/Assets/Controls.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ResourceDictionary Source="Controls/GitHubLinkButton.xaml" />
1212
<ResourceDictionary Source="Controls/LightModalViewTabControl.xaml" />
1313
<ResourceDictionary Source="Controls/ScrollViewerWithShadow.xaml" />
14-
<ResourceDictionary Source="Controls/LightListBox.xaml" />
1514
<ResourceDictionary Source="../Controls/Octicons/OcticonImage.xaml" />
1615
</ResourceDictionary.MergedDictionaries>
1716

‎src/GitHub.UI/Assets/Controls/LightListBox.xaml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -58,42 +58,4 @@
5858
</Setter.Value>
5959
</Setter>
6060
</Style>
61-
62-
<Style x:Key="LightListBox" TargetType="{x:Type ListBox}">
63-
<Setter Property="Background" Value="Transparent" />
64-
<Setter Property="BorderThickness" Value="0"/>
65-
<Setter Property="VerticalAlignment" Value="Top" />
66-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
67-
<Setter Property="ItemContainerStyle" Value="{StaticResource LightListItemContainerStyle}" />
68-
<Setter Property="TextSearch.TextPath" Value="Name" />
69-
70-
<!-- Sane default -->
71-
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
72-
<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
73-
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel" />
74-
<Setter Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="True" />
75-
76-
<Setter Property="Template">
77-
<Setter.Value>
78-
<ControlTemplate TargetType="{x:Type ListBox}">
79-
<ScrollViewer Style="{DynamicResource ScrollViewerWithShadow}">
80-
<ItemsPresenter />
81-
</ScrollViewer>
82-
</ControlTemplate>
83-
</Setter.Value>
84-
</Setter>
85-
<Setter Property="ItemTemplate">
86-
<Setter.Value>
87-
<DataTemplate>
88-
<Grid Height="30">
89-
<TextBlock
90-
VerticalAlignment="Center"
91-
Margin="30,0,6,0"
92-
Text="{Binding Name}"
93-
TextTrimming="CharacterEllipsis" />
94-
</Grid>
95-
</DataTemplate>
96-
</Setter.Value>
97-
</Setter>
98-
</Style>
9961
</ResourceDictionary>

‎src/GitHub.UI/Assets/Controls/ScrollViewerWithShadow.xaml‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -222,118 +222,6 @@
222222
</Trigger>
223223
</Style.Triggers>
224224
</Style>
225-
226-
<Style x:Key="ScrollViewerWithShadow" TargetType="{x:Type ScrollViewer}">
227-
<Setter Property="Focusable" Value="False" />
228-
<Setter Property="Padding" Value="0" />
229-
<Setter Property="Template">
230-
<Setter.Value>
231-
<ControlTemplate TargetType="{x:Type ScrollViewer}">
232-
<Grid x:Name="Grid" Background="{TemplateBinding Background}">
233-
<Grid.RowDefinitions>
234-
<RowDefinition Height="*"/>
235-
<RowDefinition Height="Auto"/>
236-
</Grid.RowDefinitions>
237-
<Rectangle
238-
x:Name="Corner"
239-
HorizontalAlignment="Right"
240-
Fill="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
241-
Grid.Row="1"/>
242-
<ScrollContentPresenter
243-
x:Name="PART_ScrollContentPresenter"
244-
CanContentScroll="{TemplateBinding CanContentScroll}"
245-
CanHorizontallyScroll="False"
246-
CanVerticallyScroll="False"
247-
ContentTemplate="{TemplateBinding ContentTemplate}"
248-
Content="{TemplateBinding Content}"
249-
Grid.Column="0"
250-
Margin="{TemplateBinding Padding}"
251-
Grid.Row="0"/>
252-
<ScrollBar
253-
x:Name="PART_VerticalScrollBar"
254-
AutomationProperties.AutomationId="VerticalScrollBar"
255-
Cursor="Arrow"
256-
HorizontalAlignment="Right"
257-
Maximum="{TemplateBinding ScrollableHeight}"
258-
Minimum="0"
259-
Grid.Row="0"
260-
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
261-
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
262-
ViewportSize="{TemplateBinding ViewportHeight}"/>
263-
<ScrollBar
264-
x:Name="PART_HorizontalScrollBar"
265-
AutomationProperties.AutomationId="HorizontalScrollBar"
266-
Cursor="Arrow"
267-
Grid.Column="0"
268-
Maximum="{TemplateBinding ScrollableWidth}"
269-
Minimum="0"
270-
Orientation="Horizontal"
271-
Grid.Row="1"
272-
Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
273-
Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
274-
ViewportSize="{TemplateBinding ViewportWidth}"/>
275-
276-
<ui:HorizontalShadowDivider
277-
x:Name="shadow"
278-
Grid.Row="0"
279-
Visibility="{TemplateBinding ContentVerticalOffset, Converter={ui:VerticalOffsetToVisibilityConverter}}"
280-
Grid.ColumnSpan="1" />
281-
282-
</Grid>
283-
<ControlTemplate.Triggers>
284-
<!-- shoutout to De Morgan
285-
- when the mouse leave AND keyboard focus leaves, hide the scrollviewer
286-
- otherwise show the scrollviewer -->
287-
<MultiTrigger>
288-
<MultiTrigger.Conditions>
289-
<Condition Property="IsMouseOver" Value="False" />
290-
<Condition Property="IsKeyboardFocusWithin" Value="False" />
291-
</MultiTrigger.Conditions>
292-
<MultiTrigger.ExitActions>
293-
<BeginStoryboard>
294-
<Storyboard>
295-
<DoubleAnimation
296-
Storyboard.TargetName="PART_VerticalScrollBar"
297-
Storyboard.TargetProperty="Opacity"
298-
From="0" To="1"
299-
Duration="0:0:0.3"
300-
EasingFunction="{StaticResource GitHubDefaultEaseInOut}" />
301-
<DoubleAnimation
302-
Storyboard.TargetName="PART_HorizontalScrollBar"
303-
Storyboard.TargetProperty="Opacity"
304-
From="0" To="1"
305-
Duration="0:0:0.3"
306-
EasingFunction="{StaticResource GitHubDefaultEaseInOut}" />
307-
</Storyboard>
308-
</BeginStoryboard>
309-
</MultiTrigger.ExitActions>
310-
<MultiTrigger.EnterActions>
311-
<BeginStoryboard>
312-
<Storyboard>
313-
<DoubleAnimation
314-
Storyboard.TargetName="PART_VerticalScrollBar"
315-
Storyboard.TargetProperty="Opacity"
316-
From="1"
317-
To="0"
318-
Duration="0:0:1"
319-
EasingFunction="{StaticResource GitHubDefaultEaseInOut}" />
320-
<DoubleAnimation
321-
Storyboard.TargetName="PART_HorizontalScrollBar"
322-
Storyboard.TargetProperty="Opacity"
323-
From="1"
324-
To="0"
325-
Duration="0:0:1"
326-
EasingFunction="{StaticResource GitHubDefaultEaseInOut}" />
327-
</Storyboard>
328-
</BeginStoryboard>
329-
</MultiTrigger.EnterActions>
330-
</MultiTrigger>
331-
332-
</ControlTemplate.Triggers>
333-
</ControlTemplate>
334-
</Setter.Value>
335-
</Setter>
336-
</Style>
337225

338226
<Style TargetType="ScrollBar" BasedOn="{StaticResource GitHubScrollBar}" />
339227
</ResourceDictionary>

‎src/GitHub.UI/Assets/Styles.xaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,6 @@
124124
<SolidColorBrush x:Key="GitHubDarkTextBoxMouseOverBorderBrush" Color="#FF545454"
125125
PresentationOptions:Freeze="true" />
126126

127-
<!-- horizontal divider brushes -->
128-
<SolidColorBrush x:Key="HorizontalDividerBorderBrush" Color="#19000000"
129-
PresentationOptions:Freeze="true" />
130-
<RadialGradientBrush x:Key="HorizontalDividerShadowBrush"
131-
PresentationOptions:Freeze="true">
132-
<GradientStop Color="Black"/>
133-
<GradientStop Offset="1" Color="#00000000"/>
134-
</RadialGradientBrush>
135-
136127
<!-- Primary fonts -->
137128
<FontFamily x:Key="GitHubFontFamilyNormal">Segoe UI</FontFamily>
138129
<FontFamily x:Key="GitHubFontFamilyLight">Segoe UI Light, Segoe UI, Global User Interface</FontFamily>

src/GitHub.UI/Controls/HorizontalShadowDivider.xaml renamed to src/GitHub.VisualStudio.UI/UI/Controls/HorizontalShadowDivider.xaml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
<UserControl x:Class="GitHub.UI.HorizontalShadowDivider"
1+
<UserControl x:Class="GitHub.VisualStudio.UI.Controls.HorizontalShadowDivider"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:cache="clr-namespace:GitHub.UI.Helpers"
7-
mc:Ignorable="d"
8-
d:DesignHeight="2"
6+
xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
7+
mc:Ignorable="d"
98
d:DesignWidth="200"
109
Width="200"
1110
Opacity=".6"
12-
Height="2"
11+
Height="23.75"
1312
Margin="0,0,0,25"
1413
IsHitTestVisible="False"
1514
VerticalAlignment="Top">
16-
<UserControl.Resources>
15+
<UserControl.Resources>
1716
<ResourceDictionary>
18-
<ResourceDictionary.MergedDictionaries>
19-
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
20-
</ResourceDictionary.MergedDictionaries>
17+
<SolidColorBrush x:Key="HorizontalDividerBorderBrush" Color="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundColorKey}}" />
18+
<RadialGradientBrush x:Key="HorizontalDividerShadowBrush">
19+
<GradientStop Color="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextColorKey}}"/>
20+
<GradientStop Offset="1" Color="#00000000"/>
21+
</RadialGradientBrush>
2122
</ResourceDictionary>
22-
</UserControl.Resources>
23-
24-
<Grid IsHitTestVisible="False">
23+
</UserControl.Resources>
24+
25+
<Grid IsHitTestVisible="False">
2526
<Rectangle
2627
Height="1"
2728
Fill="{StaticResource HorizontalDividerBorderBrush}"

src/GitHub.UI/Controls/HorizontalShadowDivider.xaml.cs renamed to src/GitHub.VisualStudio.UI/UI/Controls/HorizontalShadowDivider.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Windows;
33
using System.Windows.Controls;
44

5-
namespace GitHub.UI
5+
namespace GitHub.VisualStudio.UI.Controls
66
{
77
public partial class HorizontalShadowDivider : UserControl
88
{

‎src/GitHub.VisualStudio.UI/Views/Dialog/GistCreationView.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
77
xmlns:ghfvs="https://github.com/github/VisualStudio"
8+
xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls"
89
mc:Ignorable="d"
910
d:DesignWidth="414"
1011
d:DesignHeight="440"
@@ -29,7 +30,7 @@
2930
</Button>
3031

3132
<StackPanel>
32-
<ghfvs:HorizontalShadowDivider />
33+
<controls:HorizontalShadowDivider />
3334
<Grid
3435
FocusManager.IsFocusScope="True"
3536
Margin="30,-10,30,10"

‎src/GitHub.VisualStudio.UI/Views/Dialog/Login2FaView.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
8+
xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls"
89
mc:Ignorable="d"
910
d:DesignWidth="414"
1011
d:DesignHeight="440"
@@ -30,7 +31,7 @@
3031
Style="{DynamicResource GitHubH1TextBlock}" />
3132
</WrapPanel>
3233

33-
<ghfvs:HorizontalShadowDivider />
34+
<controls:HorizontalShadowDivider />
3435

3536
<TextBlock
3637
Margin="30,0,30,16"

‎src/GitHub.VisualStudio.UI/Views/Dialog/LoginCredentialsView.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:ghfvs="https://github.com/github/VisualStudio"
77
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
8+
xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls"
89
mc:Ignorable="d"
910
d:DesignWidth="414"
1011
d:DesignHeight="440"
@@ -42,7 +43,7 @@
4243
IsHitTestVisible="False"
4344
Text="{x:Static ghfvs:Resources.LoginLink}" />
4445

45-
<ghfvs:HorizontalShadowDivider />
46+
<controls:HorizontalShadowDivider />
4647
</StackPanel>
4748
<TabControl
4849
x:Name="hostTabControl"

‎src/GitHub.VisualStudio.UI/Views/Dialog/RepositoryCreationView.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:ghfvs="https://github.com/github/VisualStudio"
6+
xmlns:controls="clr-namespace:GitHub.VisualStudio.UI.Controls"
67
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
89
d:DesignHeight="440"
@@ -50,7 +51,7 @@
5051
<Setter Property="Margin" Value="0,5,0,0" />
5152
</Style>
5253
</StackPanel.Resources>
53-
<ghfvs:HorizontalShadowDivider />
54+
<controls:HorizontalShadowDivider />
5455
<Grid x:Name="loginStackPanel"
5556
Margin="30,-10,30,10"
5657
FocusManager.IsFocusScope="True"
@@ -207,7 +208,7 @@
207208
</ComboBox.ItemTemplate>
208209
</ghfvs:FilteredComboBox>
209210

210-
<ghfvs:HorizontalShadowDivider Grid.Row="7" Grid.ColumnSpan="2" Margin="0,12" />
211+
<controls:HorizontalShadowDivider Grid.Row="7" Grid.ColumnSpan="2" Margin="0,12" />
211212

212213
<ghfvs:GitHubComboBox x:Name="accountsComboBox"
213214
Grid.Row="8"

0 commit comments

Comments
 (0)