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

Commit 41365b1

Browse files
shanashana
committed
Merge pull request #263 from github/add-combobox-ui
Add combobox UI
2 parents afbc83a + a3de34c commit 41365b1

File tree

12 files changed

+277
-40
lines changed

12 files changed

+277
-40
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</Border>
4141
</Border>
4242

43-
<Grid Margin="1,0,0,0">
43+
<Grid Margin="1,1,0,0">
4444
<ScrollViewer
4545
x:Name="PART_ContentHost"
4646
Padding="{TemplateBinding Padding}"
@@ -51,7 +51,7 @@
5151
Margin="0"/>
5252
<Label x:Name="PromptLabel"
5353
FontSize="{TemplateBinding FontSize}"
54-
Foreground="{DynamicResource GitHubForegroundBrush}"
54+
Foreground="{TemplateBinding Foreground}"
5555
Margin="2,0,0,0"
5656
Padding="{TemplateBinding Padding}"
5757
Opacity="0"
@@ -63,6 +63,7 @@
6363
VerticalAlignment="Top">
6464
<TextBlock
6565
Text="{TemplateBinding PromptText}"
66+
Opacity="0.5"
6667
TextTrimming="CharacterEllipsis" />
6768
</Label>
6869
</Grid>
@@ -122,7 +123,6 @@
122123
</Trigger>
123124
<DataTrigger Binding="{Binding Text.Length, RelativeSource={RelativeSource Self}}" Value="0">
124125
<Setter Property="Opacity" TargetName="PromptLabel" Value="0.7" />
125-
<Setter Property="Foreground" Value="Transparent" />
126126
<Setter Property="Visibility" TargetName="clearButton" Value="Collapsed" />
127127
</DataTrigger>
128128
</ControlTemplate.Triggers>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</Border>
7272
</Border>
7373

74-
<Grid Margin="1,0,0,0">
74+
<Grid Margin="1,2,0,0">
7575
<ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" VerticalAlignment="Top" Margin="0"/>
7676
<Label x:Name="PromptLabel" HorizontalAlignment="Left"
7777
Foreground="{DynamicResource GHTextBrush}"

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,10 @@
358358
<SubType>Designer</SubType>
359359
<Generator>MSBuild:Compile</Generator>
360360
</Page>
361+
<Page Include="Styles\GitHubComboBox.xaml">
362+
<SubType>Designer</SubType>
363+
<Generator>MSBuild:Compile</Generator>
364+
</Page>
361365
<Page Include="Styles\ThemeBlue.xaml">
362366
<Generator>MSBuild:Compile</Generator>
363367
<SubType>Designer</SubType>

‎src/GitHub.VisualStudio/SharedDictionary.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ResourceDictionary.MergedDictionaries>
88
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDesignTime.xaml"/>
99
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ActionLinkButton.xaml" />
10+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubComboBox.xaml" />
1011
</ResourceDictionary.MergedDictionaries>
1112

1213
<Style x:Key="VSStyledButton" BasedOn="{StaticResource VsButtonStyleKey}" TargetType="{x:Type Button}" />

‎src/GitHub.VisualStudio/Styles/GitHubComboBox.xaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
4+
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
5+
6+
<ResourceDictionary.MergedDictionaries>
7+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
9+
10+
<Style x:Key="GitHubComboBoxBorder" TargetType="{x:Type Border}">
11+
<Setter Property="Margin" Value="10" />
12+
<Setter Property="BorderThickness" Value="1" />
13+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
14+
<Setter Property="Effect">
15+
<Setter.Value>
16+
<DropShadowEffect Direction="315" ShadowDepth="5" BlurRadius="5" Opacity="0.25" />
17+
</Setter.Value>
18+
</Setter>
19+
</Style>
20+
21+
<Style x:Key="GitHubComboBoxContainer" TargetType="{x:Type Grid}">
22+
<Setter Property="Background" Value="{DynamicResource GitHubComboBoxBackgroundBrush}" />
23+
24+
<Style.Resources>
25+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
26+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
27+
</Style>
28+
29+
<Style TargetType="{x:Type ui:OcticonImage}" BasedOn="{StaticResource {x:Type ui:OcticonImage}}">
30+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />
31+
</Style>
32+
33+
<Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Type Separator}}">
34+
<Setter Property="Background" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
35+
<Setter Property="Margin" Value="0" />
36+
</Style>
37+
38+
<Style TargetType="{x:Type ui:FilterTextBox}" BasedOn="{StaticResource {x:Type ui:FilterTextBox}}">
39+
<Setter Property="BorderBrush" Value="{DynamicResource GitHubComboBoxBorderBrush}" />
40+
<Setter Property="Foreground" Value="{DynamicResource GitHubVsWindowText}" />
41+
<Setter Property="Background" Value="{DynamicResource GitHubVsBrandedUIBackground}" />
42+
<Setter Property="Margin" Value="5" />
43+
<Setter Property="Height" Value="25" />
44+
</Style>
45+
46+
<Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
47+
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
48+
<Setter Property="BorderThickness" Value="0" />
49+
<Setter Property="Background" Value="Transparent" />
50+
<Setter Property="MaxHeight" Value="100" />
51+
</Style>
52+
53+
<Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
54+
<Setter Property="Padding" Value="3" />
55+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
56+
</Style>
57+
</Style.Resources>
58+
</Style>
59+
60+
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeBlue.xaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@
3636
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF599942" />
3737
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF68B34D" />
3838
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF599942" />
39+
40+
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
41+
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
3942
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeDark.xaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@
4141
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF7BA84D" />
4242
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF95CC5E" />
4343
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF7BA84D" />
44+
45+
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FF1B1B1C" />
46+
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FF434346" />
4447
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeDesignTime.xaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
55

66
<ResourceDictionary.MergedDictionaries>
7-
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeDark.xaml" />
7+
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/ThemeBlue.xaml" />
88
</ResourceDictionary.MergedDictionaries>
99

1010
<!-- Design time colors taken from the VS dark theme
@@ -16,12 +16,9 @@
1616
<SolidColorBrush x:Key="GitHubVsSearchBoxBackground" Color="#FF333337" />
1717
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FFF1F1F1" />
1818
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF3F3F46" />
19-
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FF2D2D30" />
20-
2119
-->
2220

2321
<!-- Design time colors taken from the VS light theme
24-
-->
2522
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF1E1E1E" />
2623
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFF5F5F5" />
2724
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF717171" />
@@ -31,8 +28,10 @@
3128
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF1E1E1E" />
3229
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FFCCCEBD" />
3330
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFEEEEF2" />
31+
-->
3432

3533
<!-- Design time colors taken from the VS blue theme
34+
-->
3635
<SolidColorBrush x:Key="GitHubVsToolWindowText" Color="#FF000000" />
3736
<SolidColorBrush x:Key="GitHubVsToolWindowBackground" Color="#FFFFFFFF" />
3837
<SolidColorBrush x:Key="GitHubVsGrayText" Color="#FF6d6d6d" />
@@ -42,5 +41,4 @@
4241
<SolidColorBrush x:Key="GitHubVsWindowText" Color="#FF000000" />
4342
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="#FF8591A2" />
4443
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="#FFFFFFFF" />
45-
-->
4644
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/ThemeLight.xaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@
4141
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderBrush" Color="#FF599942" />
4242
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderMouseOverBrush" Color="#FF68B34D" />
4343
<SolidColorBrush x:Key="GitHubPrimaryButtonBorderPressedBrush" Color="#FF599942" />
44+
45+
<SolidColorBrush x:Key="GitHubComboBoxBackgroundBrush" Color="#FFF6F6F6" />
46+
<SolidColorBrush x:Key="GitHubComboBoxBorderBrush" Color="#FFCCCEDC" />
4447
</ResourceDictionary>

‎src/GitHub.VisualStudio/Styles/VsBrush.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
<SolidColorBrush x:Key="GitHubVsWindowText" Color="{DynamicResource VsColor.WindowText}" />
1313
<SolidColorBrush x:Key="GitHubVsBrandedUIBorder" Color="{DynamicResource VsColor.BrandedUIBorder}" />
1414
<SolidColorBrush x:Key="GitHubVsBrandedUIBackground" Color="{DynamicResource VsColor.BrandedUIBackground}" />
15+
<SolidColorBrush x:Key="GitHubVsComboBoxPopupBorder" Color="{DynamicResource VsColor.ComboBoxPopupBorder}" />
1516
</ResourceDictionary>

0 commit comments

Comments
 (0)