Qt-UI Close settings when screen turns off (#20117)

old-commit-hash: b805200194
commatwo_master
grekiki 4 years ago committed by GitHub
parent 7001e40fb5
commit 1e74eb0547
  1. 3
      selfdrive/ui/qt/home.cc
  2. 2
      selfdrive/ui/qt/home.hpp
  3. 1
      selfdrive/ui/qt/window.cc

@ -144,6 +144,7 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
layout->addWidget(home, 0, 0);
QObject::connect(glWindow, SIGNAL(offroadTransition(bool)), this, SLOT(setVisibility(bool)));
QObject::connect(glWindow, SIGNAL(offroadTransition(bool)), this, SIGNAL(offroadTransition(bool)));
QObject::connect(glWindow, SIGNAL(screen_shutoff()), this, SIGNAL(closeSettings()));
QObject::connect(this, SIGNAL(openSettings()), home, SLOT(refresh()));
setLayout(layout);
setStyleSheet(R"(
@ -241,8 +242,8 @@ void GLWindow::backlightUpdate() {
if (!ui_state.awake) {
brightness = 0;
emit screen_shutoff();
}
std::thread{set_backlight, brightness}.detach();
}

@ -28,6 +28,7 @@ public:
signals:
void offroadTransition(bool offroad);
void screen_shutoff();
protected:
void initializeGL() override;
@ -85,6 +86,7 @@ public:
signals:
void offroadTransition(bool offroad);
void openSettings();
void closeSettings();
protected:
void mousePressEvent(QMouseEvent* e) override;

@ -15,6 +15,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
main_layout->setMargin(0);
setLayout(main_layout);
QObject::connect(homeWindow, SIGNAL(openSettings()), this, SLOT(openSettings()));
QObject::connect(homeWindow, SIGNAL(closeSettings()), this, SLOT(closeSettings()));
QObject::connect(homeWindow, SIGNAL(offroadTransition(bool)), this, SLOT(offroadTransition(bool)));
QObject::connect(settingsWindow, SIGNAL(closeSettings()), this, SLOT(closeSettings()));

Loading…
Cancel
Save