Skip to content

Add an option to always show the live delta #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pgrimsrud wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add an option to always show the live delta #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UI/Components/SplitComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData

//Live Delta
var splitDelta = type == ColumnType.DeltaorSplitTime || type == ColumnType.Delta;
var bestDelta = LiveSplitStateHelper.CheckLiveDelta(state, splitDelta, comparison, timingMethod);
var bestDelta = LiveSplitStateHelper.CheckLiveDelta(state, splitDelta, comparison, timingMethod, Settings.LiveDelta);
if (bestDelta != null && Split == state.CurrentSplit &&
(type == ColumnType.DeltaorSplitTime || type == ColumnType.Delta || type == ColumnType.SegmentDeltaorSegmentTime || type == ColumnType.SegmentDelta))
{
Expand Down
59 changes: 38 additions & 21 deletions UI/Components/SplitsSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion UI/Components/SplitsSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public string GradientString
public bool SeparatorLastSplit { get; set; }

public bool DropDecimals { get; set; }
public bool LiveDelta { get; set; }
public TimeAccuracy DeltasAccuracy { get; set; }

public bool OverrideDeltasColor { get; set; }
Expand Down Expand Up @@ -125,6 +126,7 @@ public SplitsSettings(LiveSplitState state)
BackgroundColor2 = Color.FromArgb(1, 255, 255, 255);
BackgroundGradient = ExtendedGradientType.Alternating;
DropDecimals = true;
LiveDelta = false;
DeltasAccuracy = TimeAccuracy.Tenths;
OverrideDeltasColor = false;
DeltasColor = Color.FromArgb(255, 255, 255);
Expand Down Expand Up @@ -153,6 +155,7 @@ public SplitsSettings(LiveSplitState state)
chkLockLastSplit.DataBindings.Add("Checked", this, "LockLastSplit", false, DataSourceUpdateMode.OnPropertyChanged);
chkSeparatorLastSplit.DataBindings.Add("Checked", this, "SeparatorLastSplit", false, DataSourceUpdateMode.OnPropertyChanged);
chkDropDecimals.DataBindings.Add("Checked", this, "DropDecimals", false, DataSourceUpdateMode.OnPropertyChanged);
chkLiveDelta.DataBindings.Add("Checked", this, "LiveDelta", false, DataSourceUpdateMode.OnPropertyChanged);
chkOverrideDeltaColor.DataBindings.Add("Checked", this, "OverrideDeltasColor", false, DataSourceUpdateMode.OnPropertyChanged);
btnDeltaColor.DataBindings.Add("BackColor", this, "DeltasColor", false, DataSourceUpdateMode.OnPropertyChanged);
btnLabelColor.DataBindings.Add("BackColor", this, "LabelsColor", false, DataSourceUpdateMode.OnPropertyChanged);
Expand Down Expand Up @@ -358,6 +361,7 @@ public void SetSettings(XmlNode node)
GradientString = SettingsHelper.ParseString(element["BackgroundGradient"], ExtendedGradientType.Plain.ToString());
SeparatorLastSplit = SettingsHelper.ParseBool(element["SeparatorLastSplit"], true);
DropDecimals = SettingsHelper.ParseBool(element["DropDecimals"], true);
LiveDelta = SettingsHelper.ParseBool(element["LiveDelta"], true);
DeltasAccuracy = SettingsHelper.ParseEnum(element["DeltasAccuracy"], TimeAccuracy.Tenths);
OverrideDeltasColor = SettingsHelper.ParseBool(element["OverrideDeltasColor"], false);
DeltasColor = SettingsHelper.ParseColor(element["DeltasColor"], Color.FromArgb(255, 255, 255));
Expand Down Expand Up @@ -427,7 +431,7 @@ public int GetSettingsHashCode()

private int CreateSettingsNode(XmlDocument document, XmlElement parent)
{
var hashCode = SettingsHelper.CreateSetting(document, parent, "Version", "1.6") ^
var hashCode = SettingsHelper.CreateSetting(document, parent, "Version", "1.7") ^
SettingsHelper.CreateSetting(document, parent, "CurrentSplitTopColor", CurrentSplitTopColor) ^
SettingsHelper.CreateSetting(document, parent, "CurrentSplitBottomColor", CurrentSplitBottomColor) ^
SettingsHelper.CreateSetting(document, parent, "VisualSplitCount", VisualSplitCount) ^
Expand Down Expand Up @@ -458,6 +462,7 @@ private int CreateSettingsNode(XmlDocument document, XmlElement parent)
SettingsHelper.CreateSetting(document, parent, "SeparatorLastSplit", SeparatorLastSplit) ^
SettingsHelper.CreateSetting(document, parent, "DeltasAccuracy", DeltasAccuracy) ^
SettingsHelper.CreateSetting(document, parent, "DropDecimals", DropDecimals) ^
SettingsHelper.CreateSetting(document, parent, "LiveDelta", LiveDelta) ^
SettingsHelper.CreateSetting(document, parent, "OverrideDeltasColor", OverrideDeltasColor) ^
SettingsHelper.CreateSetting(document, parent, "DeltasColor", DeltasColor) ^
SettingsHelper.CreateSetting(document, parent, "Display2Rows", Display2Rows) ^
Expand Down