pull/29068/head
Shane Smiskol 2 years ago
parent 92d1afca9b
commit 301b09570b
  1. 9
      selfdrive/ui/qt/onroad.cc
  2. 3
      selfdrive/ui/qt/onroad.h

@ -226,12 +226,7 @@ MapSettingsButton::MapSettingsButton(QWidget *parent) : experimental_mode(false)
setFixedSize(btn_size, btn_size); setFixedSize(btn_size, btn_size);
params = Params(); params = Params();
// engage_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size}); settings_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size});
// engage_img = loadPixmap("../assets/navigation/nav-settings-square-padding.png", {img_size, img_size});
// engage_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size});
// engage_img = loadPixmap("../assets/navigation/nav-settings-square.png", {img_size, img_size});
engage_img = loadPixmap("../assets/navigation/nav-settings-square-smaller.png", {img_size, img_size});
// experimental_img = loadPixmap("../assets/img_experimental.svg", {img_size, img_size});
QObject::connect(this, &QPushButton::clicked, this, &MapSettingsButton::changeMode); QObject::connect(this, &QPushButton::clicked, this, &MapSettingsButton::changeMode);
} }
@ -264,7 +259,7 @@ void MapSettingsButton::paintEvent(QPaintEvent *event) {
p.setBrush(QColor(0, 0, 0, 166)); p.setBrush(QColor(0, 0, 0, 166));
p.drawEllipse(center, btn_size / 2, btn_size / 2); p.drawEllipse(center, btn_size / 2, btn_size / 2);
p.setOpacity((isDown() || !engageable) ? 0.6 : 1.0); p.setOpacity((isDown() || !engageable) ? 0.6 : 1.0);
p.drawPixmap((btn_size - img_size) / 2, (btn_size - img_size) / 2, engage_img); p.drawPixmap((btn_size - img_size) / 2, (btn_size - img_size) / 2, settings_img);
} }

@ -60,8 +60,7 @@ private:
void changeMode(); void changeMode();
Params params; Params params;
QPixmap engage_img; QPixmap settings_img;
// QPixmap experimental_img;
bool experimental_mode; bool experimental_mode;
bool engageable; bool engageable;
}; };

Loading…
Cancel
Save