Skip to content

Add an option to always show the live delta #3

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
wants to merge 2 commits into
base: master
Choose a base branch
from
+57 −35
Open

Add an option to always show the live delta #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7223ad6
Add an option to always show the live delta
pgrimsrud Mar 28, 2019
9437410
remove unnecessary comparison
pgrimsrud Mar 29, 2019
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/DeltaComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void Update(IInvalidator invalidator, LiveSplitState state, float width,
{
TimeSpan? delta = LiveSplitStateHelper.GetLastDelta(state, state.CurrentSplitIndex, comparison, state.CurrentTimingMethod);
var liveDelta = state.CurrentTime[state.CurrentTimingMethod] - state.CurrentSplit.Comparisons[comparison][state.CurrentTimingMethod];
if (liveDelta > delta || (delta == null && liveDelta > TimeSpan.Zero))
if (Settings.LiveDelta || liveDelta > delta || (delta == null && liveDelta > TimeSpan.Zero))
{
delta = liveDelta;
useLiveDelta = true;
Expand Down
81 changes: 49 additions & 32 deletions UI/Components/DeltaSettings.Designer.cs
View file
Open in desktop

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

9 changes: 7 additions & 2 deletions UI/Components/DeltaSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public partial class DeltaSettings : UserControl
public bool OverrideTextColor { get; set; }
public TimeAccuracy Accuracy { get; set; }
public bool DropDecimals { get; set; }
public bool LiveDelta { get; set; }

public Color BackgroundColor { get; set; }
public Color BackgroundColor2 { get; set; }
Expand Down Expand Up @@ -44,6 +45,7 @@ public DeltaSettings()
Comparison = "Current Comparison";
Display2Rows = false;
DropDecimals = true;
LiveDelta = false;

chkOverrideTextColor.DataBindings.Add("Checked", this, "OverrideTextColor", false, DataSourceUpdateMode.OnPropertyChanged);
btnTextColor.DataBindings.Add("BackColor", this, "TextColor", false, DataSourceUpdateMode.OnPropertyChanged);
Expand All @@ -52,6 +54,7 @@ public DeltaSettings()
btnColor2.DataBindings.Add("BackColor", this, "BackgroundColor2", false, DataSourceUpdateMode.OnPropertyChanged);
cmbComparison.DataBindings.Add("SelectedItem", this, "Comparison", false, DataSourceUpdateMode.OnPropertyChanged);
chkDropDecimals.DataBindings.Add("Checked", this, "DropDecimals", false, DataSourceUpdateMode.OnPropertyChanged);
chkLiveDelta.DataBindings.Add("Checked", this, "LiveDelta", false, DataSourceUpdateMode.OnPropertyChanged);
}

void chkOverrideTextColor_CheckedChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -128,6 +131,7 @@ public void SetSettings(XmlNode node)
Comparison = SettingsHelper.ParseString(element["Comparison"]);
Display2Rows = SettingsHelper.ParseBool(element["Display2Rows"]);
DropDecimals = SettingsHelper.ParseBool(element["DropDecimals"]);
LiveDelta = SettingsHelper.ParseBool(element["LiveDelta"]);
}

public XmlNode GetSettings(XmlDocument document)
Expand All @@ -144,7 +148,7 @@ public int GetSettingsHashCode()

private int CreateSettingsNode(XmlDocument document, XmlElement parent)
{
return SettingsHelper.CreateSetting(document, parent, "Version", "1.4") ^
return SettingsHelper.CreateSetting(document, parent, "Version", "1.5") ^
SettingsHelper.CreateSetting(document, parent, "TextColor", TextColor) ^
SettingsHelper.CreateSetting(document, parent, "OverrideTextColor", OverrideTextColor) ^
SettingsHelper.CreateSetting(document, parent, "Accuracy", Accuracy) ^
Expand All @@ -153,7 +157,8 @@ private int CreateSettingsNode(XmlDocument document, XmlElement parent)
SettingsHelper.CreateSetting(document, parent, "BackgroundGradient", BackgroundGradient) ^
SettingsHelper.CreateSetting(document, parent, "Comparison", Comparison) ^
SettingsHelper.CreateSetting(document, parent, "Display2Rows", Display2Rows) ^
SettingsHelper.CreateSetting(document, parent, "DropDecimals", DropDecimals);
SettingsHelper.CreateSetting(document, parent, "DropDecimals", DropDecimals) ^
SettingsHelper.CreateSetting(document, parent, "LiveDelta", LiveDelta);
}

private void ColorButtonClick(object sender, EventArgs e)
Expand Down