SCX::GUI: use F5 for fullscreen

[slotcarman.git] / SCX / GUI.pm

diff --git a/SCX/GUI.pm b/SCX/GUI.pm
index a57c653de6fddd1b80dcd4ca247a86591aab4b03..371f919b85e0a6a0c134826686a70b64236583c3 100755 (executable)
--- a/SCX/GUI.pm
+++ b/SCX/GUI.pm
@@ -66,7 +66,7 @@ use Data::Dumper;
 sub hotkey {
        my ($window, $key, $self) = @_;
 
-       if ($key->keyval == $Gtk2::Gdk::Keysyms{F5}) {
+       if ($key->keyval && $key->keyval == $Gtk2::Gdk::Keysyms{F5}) {
                if ($self->{fullscreen}) {
                        leave_fullscreen($window, $self);
                } else {
@@ -120,7 +120,7 @@ sub set_font_sizes {
 
        if ($self->{img_height} <= 80) {
                $self->{label_size} = 10;
-               $self->{value_size} = 18;
+               $self->{value_size} = 16;
                $self->{lap_size} = 24;
        } elsif ($self->{img_height} <= 100) {
                $self->{label_size} = 12;
@@ -273,9 +273,9 @@ sub set_distance {
        if (defined $time) {
                $text = format_race_time($time);
        } elsif (defined $time_diff) {
-               $text = '−' . format_lap_time($time_diff);
+               $text = '+' . format_lap_time($time_diff);
        } elsif (defined $lap_diff) {
-               $text = '−' . $lap_diff
+               $text = '+' . $lap_diff
                        . ($lap_diff == 1 ? ' lap' : ' laps');
        }
 
@@ -292,16 +292,14 @@ sub set_laptime {
        $self->set_label('label_laptime', $row, format_lap_time($text));
 }
 
-sub set_avg_lap {
-       my ($self, $row, $text) = @_;
-
-       $self->set_label('label_avg_lap', $row, format_lap_time($text));
-}
-
 sub set_best_lap {
-       my ($self, $row, $text) = @_;
+       my ($self, $row, $text, $overall_best) = @_;
 
-       $self->set_label('label_best_lap', $row, format_lap_time($text));
+       $text = format_lap_time($text);
+       if ($overall_best) {
+               $text = '<span fgcolor="red">' . $text . '</span>';
+       }
+       $self->set_label('label_best_lap', $row, $text);
 }
 
 sub set_name {