Qt: new global WIDE_UI (#21977)

old-commit-hash: a165f25762
commatwo_master
Dean Lee 4 years ago committed by GitHub
parent f65c7e7418
commit 33b6610390
  1. 4
      selfdrive/ui/qt/offroad/onboarding.h
  2. 3
      selfdrive/ui/qt/qt_window.h

@ -72,8 +72,8 @@ private:
QRect(303, 755, 718, 189), QRect(303, 755, 718, 189),
}; };
const QString IMG_PATH = vwp_w == 2160 ? "../assets/training_wide/" : "../assets/training/"; const QString IMG_PATH = WIDE_UI ? "../assets/training_wide/" : "../assets/training/";
const QVector<QRect> boundingRect = vwp_w == 2160 ? boundingRectWide : boundingRectStandard; const QVector<QRect> boundingRect = WIDE_UI ? boundingRectWide : boundingRectStandard;
signals: signals:
void completedTraining(); void completedTraining();

@ -19,7 +19,8 @@ const QString ASSET_PATH = ":/";
const QString ASSET_PATH = "../assets/"; const QString ASSET_PATH = "../assets/";
#endif #endif
const int vwp_w = (Hardware::TICI() || (getenv("WIDE_UI") != NULL)) ? 2160 : 1920; const bool WIDE_UI = Hardware::TICI() || getenv("WIDE_UI") != nullptr;
const int vwp_w = WIDE_UI ? 2160 : 1920;
const int vwp_h = 1080; const int vwp_h = 1080;
inline void setMainWindow(QWidget *w) { inline void setMainWindow(QWidget *w) {

Loading…
Cancel
Save