Skip to content

Commit 2cf1d9a

Browse files
committed
hide duplicate platform column, fix webgl path save, skip extra columns on load settings
1 parent cd7bcf4 commit 2cf1d9a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

UnityLauncherPro/MainWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
<!--TODO platform as dropdown?-->
340340
<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding TargetPlatform}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>
341341
<!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" SelectedItemBinding="{Binding TargetPlatform, NotifyOnSourceUpdated=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
342-
<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>
342+
<!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
343343
</DataGrid.Columns>
344344

345345
<!-- right click context menu -->

UnityLauncherPro/MainWindow.xaml.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ void LoadSettings()
273273
{
274274
for (int i = 0; i < gridColumnWidths.Length; ++i)
275275
{
276+
if (i >= gridRecent.Columns.Count) break; // too many columns were saved, probably some test columns
276277
gridRecent.Columns[i].Width = gridColumnWidths[i];
277278
}
278279
}
@@ -1685,7 +1686,7 @@ private void MenuStartWebGLServer_Click(object sender, RoutedEventArgs e)
16851686

16861687
private void TxtWebglRelativePath_TextChanged(object sender, TextChangedEventArgs e)
16871688
{
1688-
Properties.Settings.Default.newProjectsRoot = txtWebglRelativePath.Text;
1689+
Properties.Settings.Default.webglBuildPath = txtWebglRelativePath.Text;
16891690
Properties.Settings.Default.Save();
16901691
}
16911692
} // class

0 commit comments

Comments
 (0)