DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Robert 2021-03-14 23:19:26 +01:00
commit d62e537de7
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelListViewModel.cs
View File

@ -116,7 +116,7 @@ namespace Artemis.UI.Shared
index++; index++;
} }
ListCount = index + 1; ListCount = index;
while (ListChildren.Count > ListCount) while (ListChildren.Count > ListCount)
ListChildren.RemoveAt(ListChildren.Count - 1); ListChildren.RemoveAt(ListChildren.Count - 1);

3
src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml
View File

@ -39,6 +39,9 @@
</VisualBrush.Visual> </VisualBrush.Visual>
</VisualBrush> </VisualBrush>
</UserControl.Resources> </UserControl.Resources>
<UserControl.InputBindings>
<KeyBinding Key="Delete" Command="{s:Action RemoveColorStop}" CommandParameter="{Binding SelectedColorStopViewModel}"/>
</UserControl.InputBindings>
<Grid Margin="16"> <Grid Margin="16">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />

7
src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
View File

@ -66,11 +66,16 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<TreeView Grid.Row="1" ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch"> <TreeView Grid.Row="1"
ItemsSource="{Binding MainDataModel.Children}"
HorizontalContentAlignment="Stretch"
VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.VirtualizationMode="Recycling">
<TreeView.Resources> <TreeView.Resources>
<Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}"> <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
<Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" /> <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
</Style> </Style>
<HierarchicalDataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}" ItemsSource="{Binding Children}"> <HierarchicalDataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}" ItemsSource="{Binding Children}">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>

1
src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
View File

@ -281,7 +281,6 @@ namespace Artemis.UI.Screens.SurfaceEditor
// ReSharper disable once UnusedMember.Global - Called from view // ReSharper disable once UnusedMember.Global - Called from view
public void EditorGridMouseMove(object sender, MouseEventArgs e) public void EditorGridMouseMove(object sender, MouseEventArgs e)
{ {
((Grid) sender).Focus();
// If holding down Ctrl, pan instead of move/select // If holding down Ctrl, pan instead of move/select
if (IsPanKeyDown()) if (IsPanKeyDown())
{ {

10
src/Artemis.UI/Screens/TrayViewModel.cs
View File

@ -49,16 +49,16 @@ namespace Artemis.UI.Screens
windowService.ConfigureMainWindowProvider(this); windowService.ConfigureMainWindowProvider(this);
messageService.ConfigureNotificationProvider(this); messageService.ConfigureNotificationProvider(this);
bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun"); bool autoRunning = Bootstrapper.StartupArguments.Contains("--autorun");
bool minimized = Bootstrapper.StartupArguments.Contains("--minimized");
bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value; bool showOnAutoRun = settingsService.GetSetting("UI.ShowOnStartup", true).Value;
if (!autoRunning || showOnAutoRun)
if (autoRunning && !showOnAutoRun || minimized)
coreService.Initialized += (_, _) => updateService.AutoUpdate();
else
{ {
ShowSplashScreen(); ShowSplashScreen();
coreService.Initialized += (_, _) => TrayBringToForeground(); coreService.Initialized += (_, _) => TrayBringToForeground();
} }
else
{
coreService.Initialized += (_, _) => updateService.AutoUpdate();
}
} }
public void TrayBringToForeground() public void TrayBringToForeground()