Skip to content

Commit c9b357d

Browse files
committed
upgrade: make current version bold, new project: detect double click properly,
1 parent 712dd8b commit c9b357d

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

UnityLauncherPro/NewProject.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Grid>
1111
<StackPanel Margin="10,3">
1212
<Label Content="Unity Version" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
13-
<DataGrid x:Name="gridAvailableVersions" KeyboardNavigation.TabNavigation = "None" SelectionMode="Single" Height="270" Margin="0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" MouseDoubleClick="gridAvailableVersions_MouseDoubleClick">
13+
<DataGrid x:Name="gridAvailableVersions" KeyboardNavigation.TabNavigation = "None" SelectionMode="Single" Height="270" Margin="0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1" Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" PreviewMouseDoubleClick="gridAvailableVersions_PreviewMouseDoubleClick">
1414
<DataGrid.Columns>
1515
<DataGridTextColumn Header="Version" Binding="{Binding Version}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
1616
<DataGridTextColumn Header="Platforms" Binding="{Binding PlatformsCombined}" IsReadOnly="True" CanUserResize="False" MinWidth="370" />

UnityLauncherPro/NewProject.xaml.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private void GridAvailableVersions_Loaded(object sender, RoutedEventArgs e)
258258
{
259259
// set initial default row color
260260
DataGridRow row = (DataGridRow)gridAvailableVersions.ItemContainerGenerator.ContainerFromIndex(gridAvailableVersions.SelectedIndex);
261-
// if now unitys available
261+
// if no unitys available
262262
if (row == null) return;
263263
//row.Background = Brushes.Green;
264264
row.Foreground = Brushes.White;
@@ -276,9 +276,15 @@ private void CmbNewProjectPlatform_DropDownOpened(object sender, System.EventArg
276276
previousSelectedModuleIndex = cmbNewProjectPlatform.SelectedIndex;
277277
}
278278

279-
private void gridAvailableVersions_MouseDoubleClick(object sender, MouseButtonEventArgs e)
279+
private void gridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
280280
{
281-
BtnCreateNewProject_Click(null, null);
281+
// check that we clicked actually on a row
282+
var src = VisualTreeHelper.GetParent((DependencyObject)e.OriginalSource);
283+
var srcType = src.GetType();
284+
if (srcType == typeof(ContentPresenter))
285+
{
286+
BtnCreateNewProject_Click(null, null);
287+
}
282288
}
283289
}
284290
}

UnityLauncherPro/UpgradeWindow.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,12 @@ private void GridAvailableVersions_PreviewKeyDown(object sender, KeyEventArgs e)
144144
private void GridAvailableVersions_Loaded(object sender, RoutedEventArgs e)
145145
{
146146
Tools.SetFocusToGrid(gridAvailableVersions);
147+
148+
// bolded for current item
149+
DataGridRow row = (DataGridRow)((DataGrid)sender).ItemContainerGenerator.ContainerFromIndex(gridAvailableVersions.SelectedIndex);
150+
if (row == null) return;
151+
row.Foreground = Brushes.White;
152+
row.FontWeight = FontWeights.Bold;
147153
}
148154

149155
private void GridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -162,6 +168,5 @@ void Upgrade()
162168
upgradeVersion = k.Value.Key;
163169
DialogResult = true;
164170
}
165-
166171
}
167172
}

0 commit comments

Comments
 (0)