From 0b8d35b132de6249640a2b8b46bdb1018dc8560c Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 21 Jul 2023 12:10:17 +0800 Subject: [PATCH] ui/map: fix ETA widget text spacing (#29065) * fix eta spacing * fix unit color --------- Co-authored-by: Justin Newberry --- selfdrive/ui/qt/maps/map_eta.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/qt/maps/map_eta.cc b/selfdrive/ui/qt/maps/map_eta.cc index 23366efbe2..4262258cfb 100644 --- a/selfdrive/ui/qt/maps/map_eta.cc +++ b/selfdrive/ui/qt/maps/map_eta.cc @@ -11,7 +11,7 @@ MapETA::MapETA(QWidget *parent) : QWidget(parent) { setVisible(false); setAttribute(Qt::WA_TranslucentBackground); eta_doc.setUndoRedoEnabled(false); - eta_doc.setDefaultStyleSheet("body {font-family:Inter;font-size:60px;color:white;} b{font-size:70px;font-weight:600}"); + eta_doc.setDefaultStyleSheet("body {font-family:Inter;font-size:70px;color:white;} b{font-weight:600;} td{padding:0 3px;}"); } void MapETA::paintEvent(QPaintEvent *event) { @@ -47,7 +47,9 @@ void MapETA::updateETA(float s, float s_typical, float d) { auto distance = std::array{QString::number(num, 'f', num < 100 ? 1 : 0), uiState()->scene.is_metric ? tr("km") : tr("mi")}; - eta_doc.setHtml(QString(R"(%1%2 %4%5 %6%7)") + eta_doc.setHtml(QString(R"( + + )") .arg(eta[0], eta[1], color, remaining[0], remaining[1], distance[0], distance[1])); setVisible(d >= MANEUVER_TRANSITION_THRESHOLD);
%1%2%4%5%6%7