Skip to content

Commit 970969f

Browse files
neon-nyanneon-nyan
committed
Fix OOBESelectGame Checkbox UI
1 parent f88803e commit 970969f

1 file changed

Lines changed: 44 additions & 40 deletions

File tree

‎CollapseLauncher/XAMLs/MainApp/Pages/OOBE/OOBESelectGame.xaml‎

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -133,46 +133,50 @@
133133
<Run FontWeight="Normal"
134134
Text="{x:Bind helper:Locale.Current.Lang._StartupPage.Pg2Subtitle2_5}" />
135135
</TextBlock>
136-
<ComboBox x:Name="GameTitleComboBox"
137-
extension:UIElementExtensions.CursorType="Hand"
138-
PlaceholderText="{x:Bind helper:Locale.Current.Lang._StartupPage.Pg2ComboBox}"
139-
SelectionChanged="GameCategorySelect_SelectionChanged">
140-
<ComboBox.ItemTemplate>
141-
<DataTemplate x:DataType="x:String">
142-
<ContentPresenter Content="{Binding Converter={StaticResource GameTitleComboBoxTranslatedConverter}}" />
143-
</DataTemplate>
144-
</ComboBox.ItemTemplate>
145-
</ComboBox>
146-
<ComboBox x:Name="GameRegionComboBox"
147-
Width="192"
148-
Margin="16,0,0,0"
149-
extension:UIElementExtensions.CursorType="Hand"
150-
CornerRadius="16"
151-
IsEnabled="False"
152-
PlaceholderText="{x:Bind helper:Locale.Current.Lang._StartupPage.Pg2ComboBoxRegion}"
153-
SelectionChanged="GameSelect_SelectionChanged">
154-
<ComboBox.ItemTemplate>
155-
<DataTemplate x:DataType="metadata:PresetConfig">
156-
<StackPanel Orientation="Horizontal"
157-
Spacing="4">
158-
<ContentPresenter Content="{Binding Converter={StaticResource GameRegionComboBoxTranslatedConverter}}" />
159-
<Grid Padding="4,0"
160-
HorizontalAlignment="Center"
161-
VerticalAlignment="Center"
162-
Background="{ThemeResource TextBoxBackgroundThemeBrush}"
163-
CornerRadius="4"
164-
Visibility="{x:Bind GameChannel, Mode=OneWay, Converter={StaticResource GameChannelToVisibilityConverter}}">
165-
<TextBlock HorizontalAlignment="Center"
166-
VerticalAlignment="Center"
167-
FontSize="10"
168-
FontWeight="Bold"
169-
Foreground="{ThemeResource TextBoxForegroundThemeBrush}"
170-
Text="{x:Bind GameChannel, Mode=OneWay, Converter={StaticResource StringUppercaseConverter}}" />
171-
</Grid>
172-
</StackPanel>
173-
</DataTemplate>
174-
</ComboBox.ItemTemplate>
175-
</ComboBox>
136+
<StackPanel Orientation="Horizontal">
137+
<ComboBox x:Name="GameTitleComboBox"
138+
extension:UIElementExtensions.CursorType="Hand"
139+
Width="192"
140+
CornerRadius="16"
141+
PlaceholderText="{x:Bind helper:Locale.Current.Lang._StartupPage.Pg2ComboBox}"
142+
SelectionChanged="GameCategorySelect_SelectionChanged">
143+
<ComboBox.ItemTemplate>
144+
<DataTemplate x:DataType="x:String">
145+
<ContentPresenter Content="{Binding Converter={StaticResource GameTitleComboBoxTranslatedConverter}}" />
146+
</DataTemplate>
147+
</ComboBox.ItemTemplate>
148+
</ComboBox>
149+
<ComboBox x:Name="GameRegionComboBox"
150+
Width="192"
151+
Margin="16,0,0,0"
152+
extension:UIElementExtensions.CursorType="Hand"
153+
CornerRadius="16"
154+
IsEnabled="False"
155+
PlaceholderText="{x:Bind helper:Locale.Current.Lang._StartupPage.Pg2ComboBoxRegion}"
156+
SelectionChanged="GameSelect_SelectionChanged">
157+
<ComboBox.ItemTemplate>
158+
<DataTemplate x:DataType="metadata:PresetConfig">
159+
<StackPanel Orientation="Horizontal"
160+
Spacing="4">
161+
<ContentPresenter Content="{Binding Converter={StaticResource GameRegionComboBoxTranslatedConverter}}" />
162+
<Grid Padding="4,0"
163+
HorizontalAlignment="Center"
164+
VerticalAlignment="Center"
165+
Background="{ThemeResource TextBoxBackgroundThemeBrush}"
166+
CornerRadius="4"
167+
Visibility="{x:Bind GameChannel, Mode=OneWay, Converter={StaticResource GameChannelToVisibilityConverter}}">
168+
<TextBlock HorizontalAlignment="Center"
169+
VerticalAlignment="Center"
170+
FontSize="10"
171+
FontWeight="Bold"
172+
Foreground="{ThemeResource TextBoxForegroundThemeBrush}"
173+
Text="{x:Bind GameChannel, Mode=OneWay, Converter={StaticResource StringUppercaseConverter}}" />
174+
</Grid>
175+
</StackPanel>
176+
</DataTemplate>
177+
</ComboBox.ItemTemplate>
178+
</ComboBox>
179+
</StackPanel>
176180
</StackPanel>
177181
</Grid>
178182
<Grid x:Name="Overlay"

0 commit comments

Comments
 (0)