Skip to content

ui: change sidebar font to Inter #24931

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

Merged
merged 4 commits into from
Jun 22, 2022
Merged

ui: change sidebar font to Inter #24931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a77c1ce
change sidebar to inter
pd0wm Jun 17, 2022
cd0121c
clean up metric color rect radius
pd0wm Jun 21, 2022
addca61
fix text placement
pd0wm Jun 21, 2022
964c1e9
simplify rect placement
pd0wm Jun 21, 2022
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
39 changes: 23 additions & 16 deletions selfdrive/ui/qt/sidebar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

#include "selfdrive/ui/qt/util.h"

void Sidebar::drawMetric(QPainter &p, const QString &label, QColor c, int y) {
const QRect rect = {30, y, 240, label.contains("\n") ? 124 : 100};
void Sidebar::drawMetric(QPainter &p, const QPair<QString, QString> &label, QColor c, int y) {
const QRect rect = {30, y, 240, 126};

p.setPen(Qt::NoPen);
p.setBrush(QBrush(c));
p.setClipRect(rect.x() + 6, rect.y(), 18, rect.height(), Qt::ClipOperation::ReplaceClip);
p.drawRoundedRect(QRect(rect.x() + 6, rect.y() + 6, 100, rect.height() - 12), 10, 10);
p.setClipRect(rect.x() + 4, rect.y(), 18, rect.height(), Qt::ClipOperation::ReplaceClip);
p.drawRoundedRect(QRect(rect.x() + 4, rect.y() + 4, 100, 118), 18, 18);
p.setClipping(false);

QPen pen = QPen(QColor(0xff, 0xff, 0xff, 0x55));
Expand All @@ -20,9 +20,16 @@ void Sidebar::drawMetric(QPainter &p, const QString &label, QColor c, int y) {
p.drawRoundedRect(rect, 20, 20);

p.setPen(QColor(0xff, 0xff, 0xff));
configFont(p, "Open Sans", 35, "Bold");
const QRect r = QRect(rect.x() + 30, rect.y(), rect.width() - 40, rect.height());
p.drawText(r, Qt::AlignCenter, label);
configFont(p, "Inter", 35, "SemiBold");

QRect label_rect = getTextRect(p, Qt::AlignCenter, label.first);
label_rect.setWidth(218);
label_rect.moveLeft(rect.left() + 22);
label_rect.moveTop(rect.top() + 19);
p.drawText(label_rect, Qt::AlignCenter, label.first);

label_rect.moveTop(rect.top() + 65);
p.drawText(label_rect, Qt::AlignCenter, label.second);
}

Sidebar::Sidebar(QWidget *parent) : QFrame(parent) {
Expand Down Expand Up @@ -57,26 +64,26 @@ void Sidebar::updateState(const UIState &s) {
ItemStatus connectStatus;
auto last_ping = deviceState.getLastAthenaPingTime();
if (last_ping == 0) {
connectStatus = ItemStatus{"CONNECT\nOFFLINE", warning_color};
connectStatus = ItemStatus{{"CONNECT", "OFFLINE"}, warning_color};
} else {
connectStatus = nanos_since_boot() - last_ping < 80e9 ? ItemStatus{"CONNECT\nONLINE", good_color} : ItemStatus{"CONNECT\nERROR", danger_color};
connectStatus = nanos_since_boot() - last_ping < 80e9 ? ItemStatus{{"CONNECT", "ONLINE"}, good_color} : ItemStatus{{"CONNECT", "ERROR"}, danger_color};
}
setProperty("connectStatus", QVariant::fromValue(connectStatus));

ItemStatus tempStatus = {"TEMP\nHIGH", danger_color};
ItemStatus tempStatus = {{"TEMP", "HIGH"}, danger_color};
auto ts = deviceState.getThermalStatus();
if (ts == cereal::DeviceState::ThermalStatus::GREEN) {
tempStatus = {"TEMP\nGOOD", good_color};
tempStatus = {{"TEMP", "GOOD"}, good_color};
} else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) {
tempStatus = {"TEMP\nOK", warning_color};
tempStatus = {{"TEMP", "OK"}, warning_color};
}
setProperty("tempStatus", QVariant::fromValue(tempStatus));

ItemStatus pandaStatus = {"VEHICLE\nONLINE", good_color};
ItemStatus pandaStatus = {{"VEHICLE", "ONLINE"}, good_color};
if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) {
pandaStatus = {"NO\nPANDA", danger_color};
pandaStatus = {{"NO", "PANDA"}, danger_color};
} else if (s.scene.started && !sm["liveLocationKalman"].getLiveLocationKalman().getGpsOK()) {
pandaStatus = {"GPS\nSEARCH", warning_color};
pandaStatus = {{"GPS", "SEARCH"}, warning_color};
}
setProperty("pandaStatus", QVariant::fromValue(pandaStatus));
}
Expand All @@ -103,7 +110,7 @@ void Sidebar::paintEvent(QPaintEvent *event) {
x += 37;
}

configFont(p, "Open Sans", 35, "Regular");
configFont(p, "Inter", 35, "Regular");
p.setPen(QColor(0xff, 0xff, 0xff));
const QRect r = QRect(50, 247, 100, 50);
p.drawText(r, Qt::AlignCenter, net_type);
Expand Down
4 changes: 2 additions & 2 deletions selfdrive/ui/qt/sidebar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "common/params.h"
#include "selfdrive/ui/ui.h"

typedef QPair<QString, QColor> ItemStatus;
typedef QPair<QPair<QString, QString>, QColor> ItemStatus;
Q_DECLARE_METATYPE(ItemStatus);

class Sidebar : public QFrame {
Expand All @@ -30,7 +30,7 @@ public slots:
protected:
void paintEvent(QPaintEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void drawMetric(QPainter &p, const QString &label, QColor c, int y);
void drawMetric(QPainter &p, const QPair<QString, QString> &label, QColor c, int y);

QPixmap home_img, settings_img;
const QMap<cereal::DeviceState::NetworkType, QString> network_type = {
Expand Down