Skip to content

Added BestTime ColumnType #12

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 1 commit into
base: master
Choose a base branch
from
Open

Added BestTime ColumnType #12

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/ColumnType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
public enum ColumnType
{
Delta, SplitTime, DeltaorSplitTime, SegmentDelta, SegmentTime, SegmentDeltaorSegmentTime
Delta, SplitTime, DeltaorSplitTime, SegmentDelta, SegmentTime, SegmentDeltaorSegmentTime, BestTime
}
}
3 changes: 2 additions & 1 deletion UI/Components/ColumnSettings.Designer.cs
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion UI/Components/ColumnSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,10 @@ private static string GetColumnType(ColumnType type)
return "Segment Time";
else if (type == ColumnType.SegmentDelta)
return "Segment Delta";
else
else if (type == ColumnType.SegmentDeltaorSegmentTime)
return "Segment Delta or Segment Time";
else
return "Best Time";
}

private static ColumnType ParseColumnType(string columnType)
Expand Down
8 changes: 7 additions & 1 deletion UI/Components/SplitComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,12 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData
label.Text = "";
}
}

if (type == ColumnType.BestTime)
{
label.ForeColor = Settings.OverrideTimesColor ? Settings.BeforeTimesColor : state.LayoutSettings.TextColor;
label.Text = TimeFormatter.Format(Split.Comparisons[Run.PersonalBestComparisonName][timingMethod]);
}
}

protected float CalculateLabelsWidth()
Expand All @@ -476,7 +482,7 @@ protected float CalculateLabelsWidth()
{
var mixedCount = ColumnsList.Count(x => x.Type == ColumnType.DeltaorSplitTime || x.Type == ColumnType.SegmentDeltaorSegmentTime);
var deltaCount = ColumnsList.Count(x => x.Type == ColumnType.Delta || x.Type == ColumnType.SegmentDelta);
var timeCount = ColumnsList.Count(x => x.Type == ColumnType.SplitTime || x.Type == ColumnType.SegmentTime);
var timeCount = ColumnsList.Count(x => x.Type == ColumnType.SplitTime || x.Type == ColumnType.SegmentTime || x.Type == ColumnType.BestTime);
return mixedCount * (Math.Max(MeasureDeltaLabel.ActualWidth, MeasureTimeLabel.ActualWidth) + 5)
+ deltaCount * (MeasureDeltaLabel.ActualWidth + 5)
+ timeCount * (MeasureTimeLabel.ActualWidth + 5);
Expand Down