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 'master' into development

Browse Source
This commit is contained in:
Robert 2021-09-18 13:38:24 +02:00
commit b4eb5e1797
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/FUNDING.yml vendored
View File

@ -1 +1,2 @@
github: [spoinkynl] github: [robertbeekman]
custom: ['https://www.paypal.com/donate/?cmd=_s-xclick&hosted_button_id=VQBAEJYUFLU4J']

7
src/Artemis.Core/Plugins/Modules/DataModel.cs
View File

@ -261,7 +261,12 @@ namespace Artemis.Core.Modules
internal T? GetDynamicChildValue<T>(string key) internal T? GetDynamicChildValue<T>(string key)
{ {
if (TryGetDynamicChild(key, out DynamicChild? dynamicChild) && dynamicChild.BaseValue != null) if (TryGetDynamicChild(key, out DynamicChild? dynamicChild) && dynamicChild.BaseValue != null)
return (T) dynamicChild.BaseValue; {
if (dynamicChild.BaseValue is T value)
return value;
return default;
}
return default; return default;
} }

2
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
View File

@ -462,7 +462,7 @@
The profile is currently running in normal mode and the timeline cannot be edited. The profile is currently running in normal mode and the timeline cannot be edited.
</TextBlock> </TextBlock>
<TextBlock Style="{StaticResource MaterialDesignBody2TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center"> <TextBlock Style="{StaticResource MaterialDesignBody2TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center">
Press <Run Text="F5" FontWeight="Bold"/> to switch between editor mode and normal mode. Auto-switching can be disabled in the options menu. Press <Run Text="F5" FontWeight="Bold"/> to switch between editor mode and normal mode. Auto-switching can be disabled in the run menu.
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>