gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

add some preliminary support for additional time gain/lose colouring

Browse source 
the colours used should be made configurable by the user instead of
using Color's brighter/darker methods, but it works for now i guess
This commit is contained in:
Gered 2015-12-04 10:53:18 -05:00
parent 6db7171704
commit a1fa2e763d
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/org/fenix/llanfair/gui/History.java
View file

@ -617,6 +617,12 @@ public class History extends JPanel {
Color recd = Settings.colorNewRecord.get(); Color recd = Settings.colorNewRecord.get();
int prev = run.getPrevious(); int prev = run.getPrevious();
// TODO: replace with color settings the user can set themselves
Color lostWhileAhead = gain.brighter();
Color gainWhileAhead = gain; //.darker();
Color lostWhileBehind = lost.brighter();
Color gainWhileBehind = lost; //.darker();
Merge merge = Settings.historyMerge.get(); Merge merge = Settings.historyMerge.get();
JLabel realDelta = (merge == Merge.DELTA) ? time : delta; JLabel realDelta = (merge == Merge.DELTA) ? time : delta;
JLabel realLive = (merge == Merge.LIVE ) ? time : live; JLabel realLive = (merge == Merge.LIVE ) ? time : live;
@ -634,11 +640,20 @@ public class History extends JPanel {
realLive.setForeground(neut); realLive.setForeground(neut);
realDelta.setForeground(neut); realDelta.setForeground(neut);
} else { } else {
boolean isGainingTime = run.isBetterSegment(run.getPrevious());
if (compare > 0) { if (compare > 0) {
realDelta.setForeground(lost); if (isGainingTime)
realDelta.setForeground(gainWhileBehind);
else
realDelta.setForeground(lostWhileBehind);
realLive.setForeground(lost); realLive.setForeground(lost);
} else { } else {
realDelta.setForeground(gain); if (isGainingTime)
realDelta.setForeground(gainWhileAhead);
else
realDelta.setForeground(lostWhileAhead);
realLive.setForeground(gain); realLive.setForeground(gain);
} }
} }