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

Commit b063ca9

Browse files
committed
Use built in ComboBox for RepositoryCreactionView
1 parent 76e4bbd commit b063ca9

File tree

5 files changed

+6
-273
lines changed

5 files changed

+6
-273
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<ResourceDictionary Source="Controls\Validation\UserErrorMessages.xaml" />
1010
<ResourceDictionary Source="Controls\Validation\ValidationMessage.xaml" />
1111
<ResourceDictionary Source="Controls\GitHubTabControl.xaml" />
12-
<ResourceDictionary Source="Controls\FilteredComboBox.xaml" />
1312
<ResourceDictionary Source="Controls\GitHubComboBox.xaml" />
1413
</ResourceDictionary.MergedDictionaries>
1514
</ResourceDictionary>

src/GitHub.UI.Reactive/Assets/Controls/FilteredComboBox.xaml

Lines changed: 0 additions & 117 deletions
This file was deleted.

src/GitHub.UI.Reactive/Controls/FilteredComboBox.cs

Lines changed: 0 additions & 147 deletions
This file was deleted.

src/GitHub.VisualStudio.UI/Views/Dialog/DialogStyles.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
</ResourceDictionary.MergedDictionaries>
1010
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubH1TextBlock" BasedOn="{StaticResource TextBlockEnvironment200PercentFontSizeStyleKey}" />
1111
<Style TargetType="{x:Type TextBlock}" x:Key="GitHubDescriptionTextBlock" BasedOn="{StaticResource TextBlockEnvironment111PercentFontSizeStyleKey}" />
12-
<Style TargetType="{x:Type ghfvs:FilteredComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}" />
13-
<Style TargetType="{x:Type ghfvs:GitHubComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}" />
1412
</ResourceDictionary>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
Grid.Column="0"
169169
Content="{x:Static ghfvs:Resources.ignoreTemplateListText}"
170170
Target="{Binding ElementName=ignoreTemplateList}" />
171-
<ghfvs:FilteredComboBox x:Name="ignoreTemplateList"
171+
<ComboBox x:Name="ignoreTemplateList"
172172
Grid.Row="5"
173173
Grid.Column="1"
174174
ItemsSource="{Binding GitIgnoreTemplates}"
@@ -184,13 +184,13 @@
184184
</DataTemplate.Triggers>
185185
</DataTemplate>
186186
</ComboBox.ItemTemplate>
187-
</ghfvs:FilteredComboBox>
187+
</ComboBox>
188188

189189
<Label Grid.Row="6"
190190
Grid.Column="0"
191191
Content="{x:Static ghfvs:Resources.licenseListText}"
192192
Target="{Binding ElementName=licenseList}" />
193-
<ghfvs:FilteredComboBox x:Name="licenseList"
193+
<ComboBox x:Name="licenseList"
194194
Grid.Row="6"
195195
Grid.Column="1"
196196
ItemsSource="{Binding Licenses}"
@@ -206,11 +206,11 @@
206206
</DataTemplate.Triggers>
207207
</DataTemplate>
208208
</ComboBox.ItemTemplate>
209-
</ghfvs:FilteredComboBox>
209+
</ComboBox>
210210

211211
<controls:HorizontalShadowDivider Grid.Row="7" Grid.ColumnSpan="2" Margin="0,12" />
212212

213-
<ghfvs:GitHubComboBox x:Name="accountsComboBox"
213+
<ComboBox x:Name="accountsComboBox"
214214
Grid.Row="8"
215215
Grid.Column="1"
216216
Margin="0,0,0,8"
@@ -229,7 +229,7 @@
229229
</StackPanel>
230230
</DataTemplate>
231231
</ComboBox.ItemTemplate>
232-
</ghfvs:GitHubComboBox>
232+
</ComboBox>
233233

234234
<CheckBox x:Name="makePrivate"
235235
Grid.Row="9"

0 commit comments

Comments
 (0)