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

Fixed dynamic properties

Browse Source
This commit is contained in:
SpoinkyNL 2016-06-06 20:26:52 +02:00
parent 6e390ab3a7
commit afb8c60851
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Artemis/Artemis/Models/Profiles/Properties/DynamicPropertiesModel.cs
View File

@ -37,15 +37,15 @@ namespace Artemis.Models.Profiles.Properties
/// </summary> /// </summary>
public LayerPropertyOptions LayerPropertyOptions { get; set; } public LayerPropertyOptions LayerPropertyOptions { get; set; }
internal void ApplyProperty(IDataModel dataModel, AppliedProperties properties) internal void ApplyProperty(IDataModel dataModel, ref AppliedProperties properties)
{ {
if (LayerPropertyType == LayerPropertyType.PercentageOf) if (LayerPropertyType == LayerPropertyType.PercentageOf)
ApplyPercentageOf(dataModel, properties, PercentageSource); ApplyPercentageOf(dataModel, ref properties, PercentageSource);
if (LayerPropertyType == LayerPropertyType.PercentageOfProperty) if (LayerPropertyType == LayerPropertyType.PercentageOfProperty)
ApplyPercentageOfProperty(dataModel, properties); ApplyPercentageOfProperty(dataModel, ref properties);
} }
private void ApplyPercentageOf(IDataModel dataModel, AppliedProperties properties, double src) private void ApplyPercentageOf(IDataModel dataModel, ref AppliedProperties properties, double src)
{ {
if (GameProperty == null) if (GameProperty == null)
return; return;
@ -54,14 +54,14 @@ namespace Artemis.Models.Profiles.Properties
var percentage = ToDouble(gameProperty)/src; var percentage = ToDouble(gameProperty)/src;
if (LayerProperty == "Width") if (LayerProperty == "Width")
ApplyWidth(properties, percentage); ApplyWidth(ref properties, percentage);
else if (LayerProperty == "Height") else if (LayerProperty == "Height")
ApplyHeight(properties, percentage); ApplyHeight(ref properties, percentage);
else if (LayerProperty == "Opacity") else if (LayerProperty == "Opacity")
ApplyOpacity(properties, percentage); ApplyOpacity(ref properties, percentage);
} }
private void ApplyWidth(AppliedProperties properties, double percentage) private void ApplyWidth(ref AppliedProperties properties, double percentage)
{ {
var newWidth = percentage * properties.Width; var newWidth = percentage * properties.Width;
var difference = properties.Width - newWidth; var difference = properties.Width - newWidth;
@ -72,7 +72,7 @@ namespace Artemis.Models.Profiles.Properties
properties.X = properties.X + difference; properties.X = properties.X + difference;
} }
private void ApplyHeight(AppliedProperties properties, double percentage) private void ApplyHeight(ref AppliedProperties properties, double percentage)
{ {
var newHeight = percentage*properties.Height; var newHeight = percentage*properties.Height;
var difference = properties.Height - newHeight; var difference = properties.Height - newHeight;
@ -82,7 +82,7 @@ namespace Artemis.Models.Profiles.Properties
properties.Y = properties.Y + difference; properties.Y = properties.Y + difference;
} }
private void ApplyOpacity(AppliedProperties properties, double percentage) private void ApplyOpacity(ref AppliedProperties properties, double percentage)
{ {
properties.Opacity = percentage*properties.Opacity; properties.Opacity = percentage*properties.Opacity;
if (properties.Opacity < 0.0) if (properties.Opacity < 0.0)
@ -95,10 +95,10 @@ namespace Artemis.Models.Profiles.Properties
properties.Opacity = 1.0 - properties.Opacity; properties.Opacity = 1.0 - properties.Opacity;
} }
private void ApplyPercentageOfProperty(IDataModel dataModel, AppliedProperties properties) private void ApplyPercentageOfProperty(IDataModel dataModel, ref AppliedProperties properties)
{ {
var value = dataModel.GetPropValue<int>(PercentageProperty); var value = dataModel.GetPropValue<int>(PercentageProperty);
ApplyPercentageOf(dataModel, properties, value); ApplyPercentageOf(dataModel, ref properties, value);
} }
} }

2
Artemis/Artemis/Models/Profiles/Properties/KeyboardPropertiesModel.cs
View File

@ -51,7 +51,7 @@ namespace Artemis.Models.Profiles.Properties
return applied; return applied;
foreach (var dynamicProperty in DynamicProperties) foreach (var dynamicProperty in DynamicProperties)
dynamicProperty.ApplyProperty(dataModel, applied); dynamicProperty.ApplyProperty(dataModel, ref applied);
if (Math.Abs(applied.Opacity - 1) > 0.001) if (Math.Abs(applied.Opacity - 1) > 0.001)
{ {