Skip to content

Commit 56d8839

Browse files
committed
show upgrade dialog if no version for commandline launch, override home and end keys to scroll in recentlist, update unityinstallations on F5 for recentlist, add double click for upgradelist, #build
1 parent ed027de commit 56d8839

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

Diff for: UnityLauncherPro/MainWindow.xaml.cs

+12-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void HandleCommandLineLaunch()
145145

146146
// check if force-update button is down
147147
// NOTE if keydown, window doesnt become active and focused
148-
if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0)
148+
if (string.IsNullOrEmpty(version) || (Keyboard.Modifiers & ModifierKeys.Shift) != 0)
149149
{
150150
Tools.DisplayUpgradeDialog(proj, null);
151151
}
@@ -785,7 +785,18 @@ private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
785785
{
786786
switch (e.Key)
787787
{
788+
case Key.Home: // override home
789+
gridRecent.SelectedIndex = 0;
790+
gridRecent.ScrollIntoView(gridRecent.SelectedItem);
791+
e.Handled = true;
792+
break;
793+
case Key.End: // override end
794+
gridRecent.SelectedIndex = gridRecent.Items.Count - 1;
795+
gridRecent.ScrollIntoView(gridRecent.SelectedItem);
796+
e.Handled = true;
797+
break;
788798
case Key.F5: // refresh projects
799+
UpdateUnityInstallationsList();
789800
RefreshRecentProjects();
790801
break;
791802
case Key.Tab:

Diff for: UnityLauncherPro/UpgradeWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<Button Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="0,434,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" Width="159" VerticalAlignment="Top" Height="51" Click="BtnUpgradeProject_Click" >
190190
<Label Foreground="{DynamicResource ButtonForeground}" Content="_Upgrade Project"/>
191191
</Button>
192-
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded">
192+
<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded" PreviewMouseDoubleClick="GridAvailableVersions_PreviewMouseDoubleClick">
193193
<DataGrid.Columns>
194194
<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" />
195195
<DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" />

Diff for: UnityLauncherPro/UpgradeWindow.xaml.cs

+13-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
6262

6363
private void BtnUpgradeProject_Click(object sender, RoutedEventArgs e)
6464
{
65-
var k = (gridAvailableVersions.SelectedItem) as KeyValuePair<string, string>?;
66-
upgradeVersion = k.Value.Key;
67-
DialogResult = true;
65+
Upgrade();
6866
}
6967

7068
private void BtnCancelUpgrade_Click(object sender, RoutedEventArgs e)
@@ -130,5 +128,17 @@ private void GridAvailableVersions_Loaded(object sender, RoutedEventArgs e)
130128
// row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
131129
}
132130

131+
private void GridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
132+
{
133+
Upgrade();
134+
}
135+
136+
void Upgrade()
137+
{
138+
var k = (gridAvailableVersions.SelectedItem) as KeyValuePair<string, string>?;
139+
upgradeVersion = k.Value.Key;
140+
DialogResult = true;
141+
}
142+
133143
}
134144
}

0 commit comments

Comments
 (0)