remove old button

pull/29068/head
Shane Smiskol 2 years ago
parent 52fcc9320e
commit 514cf685cc
  1. 52
      selfdrive/ui/qt/maps/map.cc
  2. 4
      selfdrive/ui/qt/maps/map.h

@ -34,28 +34,28 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) : m_settings(settings),
map_eta->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); map_eta->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
map_eta->setFixedHeight(120); map_eta->setFixedHeight(120);
// Settings button // // Settings button
QSize icon_size(120, 120); // QSize icon_size(120, 120);
directions_icon = loadPixmap("../assets/navigation/icon_directions_outlined.svg", icon_size); // directions_icon = loadPixmap("../assets/navigation/icon_directions_outlined.svg", icon_size);
settings_icon = loadPixmap("../assets/navigation/icon_settings.svg", icon_size); // settings_icon = loadPixmap("../assets/navigation/icon_settings.svg", icon_size);
//
settings_btn = new QPushButton(directions_icon, "", this); // settings_btn = new QPushButton(directions_icon, "", this);
settings_btn->setIconSize(icon_size); // settings_btn->setIconSize(icon_size);
settings_btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); // settings_btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
settings_btn->setStyleSheet(R"( // settings_btn->setStyleSheet(R"(
QPushButton { // QPushButton {
background-color: #96000000; // background-color: #96000000;
border-radius: 50px; // border-radius: 50px;
padding: 24px; // padding: 24px;
margin-left: 30px; // margin-left: 30px;
} // }
QPushButton:pressed { // QPushButton:pressed {
background-color: #D9000000; // background-color: #D9000000;
} // }
)"); // )");
QObject::connect(settings_btn, &QPushButton::clicked, [=]() { // QObject::connect(settings_btn, &QPushButton::clicked, [=]() {
emit requestSettings(true); // emit requestSettings(true);
}); // });
error = new QLabel(this); error = new QLabel(this);
error->setStyleSheet(R"(color:white;padding:50px 11px;font-size: 90px; background-color:rgb(0, 0, 0, 150);)"); error->setStyleSheet(R"(color:white;padding:50px 11px;font-size: 90px; background-color:rgb(0, 0, 0, 150);)");
@ -64,7 +64,7 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) : m_settings(settings),
overlay_layout->addWidget(error); overlay_layout->addWidget(error);
overlay_layout->addWidget(map_instructions); overlay_layout->addWidget(map_instructions);
overlay_layout->addStretch(1); overlay_layout->addStretch(1);
overlay_layout->addWidget(settings_btn, Qt::AlignLeft); // overlay_layout->addWidget(settings_btn, Qt::AlignLeft);
overlay_layout->addSpacing(UI_BORDER_SIZE); overlay_layout->addSpacing(UI_BORDER_SIZE);
overlay_layout->addWidget(map_eta); overlay_layout->addWidget(map_eta);
@ -253,9 +253,9 @@ void MapWindow::updateState(const UIState &s) {
clearRoute(); clearRoute();
} }
if (isVisible()) { // if (isVisible()) {
settings_btn->setIcon(map_eta->isVisible() ? settings_icon : directions_icon); // settings_btn->setIcon(map_eta->isVisible() ? settings_icon : directions_icon);
} // }
} }
if (sm.rcv_frame("navRoute") != route_rcv_frame) { if (sm.rcv_frame("navRoute") != route_rcv_frame) {

@ -70,8 +70,8 @@ private:
QLabel *error; QLabel *error;
MapInstructions* map_instructions; MapInstructions* map_instructions;
MapETA* map_eta; MapETA* map_eta;
QPushButton *settings_btn; // QPushButton *settings_btn;
QPixmap directions_icon, settings_icon; // QPixmap directions_icon, settings_icon;
// Blue with normal nav, green when nav is input into the model // Blue with normal nav, green when nav is input into the model
QColor getNavPathColor(bool nav_enabled) { QColor getNavPathColor(bool nav_enabled) {

Loading…
Cancel
Save