Skip to content

Commit 03c76a2

Browse files
committed
[refactoring] Improve UI scaling a bit
1 parent da41a1e commit 03c76a2

File tree

4 files changed

+38
-5
lines changed

4 files changed

+38
-5
lines changed

internal/app/controller/engine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,9 @@ func (e *Engine) LogModify(m EventModifyValue) {
300300
Timestamp: e.TimeProvider().UnixNano(),
301301
StageTime: e.State.StageTimeElapsed,
302302
Type: RefereeEventModify,
303-
Name: "modify",
303+
Name: m.Type(),
304304
Team: team,
305-
Description: m.String(),
305+
Description: m.Value(),
306306
}
307307
e.RefereeEvents = append(e.RefereeEvents, refereeEvent)
308308
}

internal/app/controller/events.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package controller
33
import (
44
"encoding/json"
55
"fmt"
6+
"log"
7+
"reflect"
68
"time"
79
)
810

@@ -122,6 +124,31 @@ func (m EventModifyValue) String() string {
122124
return string(b)
123125
}
124126

127+
func (m EventModifyValue) Type() string {
128+
v := reflect.ValueOf(m)
129+
for i := 0; i < v.NumField(); i++ {
130+
fieldName := v.Type().Field(i).Name
131+
log.Print(fieldName, " ", v.Field(i))
132+
if fieldName != "ForTeam" && !v.Field(i).IsNil() {
133+
return fieldName
134+
}
135+
}
136+
return "unknown"
137+
}
138+
139+
func (m EventModifyValue) Value() string {
140+
v := reflect.ValueOf(m)
141+
for i := 0; i < v.NumField(); i++ {
142+
fieldName := v.Type().Field(i).Name
143+
log.Print(fieldName, " ", v.Field(i))
144+
if fieldName != "ForTeam" && !v.Field(i).IsNil() {
145+
b, _ := json.Marshal(v.Field(i).Interface())
146+
return string(b)
147+
}
148+
}
149+
return "unknown"
150+
}
151+
125152
// EventTrigger is an event that can be applied
126153
type EventTrigger struct {
127154
Type TriggerType `json:"triggerType"`

src/App.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
#app-header {
101101
display: flex;
102102
flex-direction: row;
103-
flex-wrap: wrap-reverse;
103+
flex-wrap: wrap;
104104
justify-content: space-between;
105105
align-items: baseline;
106106
align-content: flex-start;
@@ -135,6 +135,12 @@
135135
flex-grow: 1;
136136
}
137137
138+
@media only screen and (max-width: 1600px) {
139+
.main-middle-container {
140+
order: 10;
141+
}
142+
}
143+
138144
@-moz-document url-prefix() {
139145
/* CSS-Hack for limiting following style to Firefox only */
140146
.main-middle-container {

src/components/control/ControlGeneral.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<span class="control-general">
2+
<div class="control-general">
33
<span v-b-tooltip.hover
44
:title="'Immediately stop all robots (' + Object.keys(keymapHalt)[0] + ')'">
55
<b-button v-hotkey="keymapHalt"
@@ -59,7 +59,7 @@
5959
Manual
6060
</label>
6161
</div>
62-
</span>
62+
</div>
6363
</template>
6464

6565
<script>

0 commit comments

Comments
 (0)