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-05-25 14:17:08 +02:00
commit 0ed367530f
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Artemis.Core/DefaultLayouts/Artemis/Keyboard/Artemis L keyboard-ISO.xml
View File

@ -373,7 +373,7 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Backslash"> <Led Id="Keyboard_Enter">
<Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape> <Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape>
<Width>1.5</Width> <Width>1.5</Width>
<Height>2</Height> <Height>2</Height>
@ -522,11 +522,11 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Enter"> <Led Id="Keyboard_NonUsTilde">
<Width>1</Width> <Width>1</Width>
<CustomData> <CustomData>
<LogicalLayouts> <LogicalLayouts>
<LogicalLayout Name="GB" Image="Keycaps/BlackslashIso.png" /> <LogicalLayout Name="GB" Image="Keycaps/TildeIso.png" />
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>

6
src/Artemis.Core/DefaultLayouts/Artemis/Keyboard/Artemis TKL keyboard-ISO.xml
View File

@ -344,7 +344,7 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Backslash"> <Led Id="Keyboard_Enter">
<Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape> <Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape>
<Width>1.5</Width> <Width>1.5</Width>
<Height>2</Height> <Height>2</Height>
@ -463,11 +463,11 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Enter"> <Led Id="Keyboard_NonUsTilde">
<Width>1</Width> <Width>1</Width>
<CustomData> <CustomData>
<LogicalLayouts> <LogicalLayouts>
<LogicalLayout Name="GB" Image="Keycaps/BlackslashIso.png" /> <LogicalLayout Name="GB" Image="Keycaps/TildeIso.png" />
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>

6
src/Artemis.Core/DefaultLayouts/Artemis/Keyboard/Artemis XL keyboard-ISO.xml
View File

@ -373,7 +373,7 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Backslash"> <Led Id="Keyboard_Enter">
<Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape> <Shape>M0,0 L0,0.5 L0.16666666666,0.5 L0.16666666666,1 L1,1 L1,0 Z</Shape>
<Width>1.5</Width> <Width>1.5</Width>
<Height>2</Height> <Height>2</Height>
@ -522,11 +522,11 @@
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>
<Led Id="Keyboard_Enter"> <Led Id="Keyboard_NonUsTilde">
<Width>1</Width> <Width>1</Width>
<CustomData> <CustomData>
<LogicalLayouts> <LogicalLayouts>
<LogicalLayout Name="GB" Image="Keycaps/BlackslashIso.png" /> <LogicalLayout Name="GB" Image="Keycaps/TildeIso.png" />
</LogicalLayouts> </LogicalLayouts>
</CustomData> </CustomData>
</Led> </Led>

BIN
src/Artemis.Core/DefaultLayouts/Artemis/Keyboard/Keycaps/TildeIso.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

6
src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorViewModel.cs
View File

@ -85,8 +85,12 @@ namespace Artemis.UI.Shared.Screens.GradientEditor
NotifyOfPropertyChange(nameof(HasMoreThanOneStop)); NotifyOfPropertyChange(nameof(HasMoreThanOneStop));
} }
public void RemoveColorStop(ColorStopViewModel colorStopViewModel) public void RemoveColorStop(ColorStopViewModel? colorStopViewModel)
{ {
// Can be null when called by the view
if (colorStopViewModel == null)
return;
ColorStopViewModels.Remove(colorStopViewModel); ColorStopViewModels.Remove(colorStopViewModel);
ColorGradient.Remove(colorStopViewModel.ColorStop); ColorGradient.Remove(colorStopViewModel.ColorStop);