nicer spinner

selfdrive/ui/qt/spinner.cc

@@ -19,32 +19,29 @@
 Spinner::Spinner(QWidget *parent) {
   QGridLayout *main_layout = new QGridLayout();
   main_layout->setSpacing(0);
-  main_layout->setMargin(50);
+  main_layout->setContentsMargins(200, 200, 200, 200);
 
-  const int img_size = 500;
+  const int img_size = 360;
 
   comma = new QLabel();
-  comma->setPixmap(QPixmap("../assets/img_spinner_comma.png").scaled(img_size, img_size, Qt::KeepAspectRatio));
+  comma->setPixmap(QPixmap("../assets/img_spinner_comma.png").scaled(img_size, img_size, Qt::KeepAspectRatio, Qt::SmoothTransformation));
   comma->setFixedSize(img_size, img_size);
   main_layout->addWidget(comma, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter);
 
-  track_img = QPixmap("../assets/img_spinner_track.png").scaled(img_size, img_size, Qt::KeepAspectRatio);
+  track_img = QPixmap("../assets/img_spinner_track.png").scaled(img_size, img_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
   track = new QLabel();
   track->setPixmap(track_img);
   track->setFixedSize(img_size, img_size);
   main_layout->addWidget(track, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter);
 
-  text = new QLabel("building boardd");
+  text = new QLabel();
   text->setVisible(false);
-  text->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
   main_layout->addWidget(text, 1, 0, Qt::AlignHCenter);
 
   progress_bar = new QProgressBar();
-  progress_bar->setMinimum(5);
-  progress_bar->setMaximum(100);
+  progress_bar->setRange(5, 100);
   progress_bar->setTextVisible(false);
   progress_bar->setVisible(false);
-  progress_bar->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
   main_layout->addWidget(progress_bar, 1, 0, Qt::AlignHCenter);
 
   setLayout(main_layout);
@@ -58,12 +55,13 @@ Spinner::Spinner(QWidget *parent) {
     }
     QProgressBar {
       background-color: #373737;
-      border: none;
-      margin: 100px;
-      height: 50px;
+      height: 20px;
       width: 1000px;
+      border solid white;
+      border-radius: 10px;
     }
     QProgressBar::chunk {
+      border-radius: 10px;
       background-color: white;
     }
   )");
@@ -79,10 +77,10 @@ Spinner::Spinner(QWidget *parent) {
 void Spinner::rotate() {
   transform.rotate(5);
 
-  QPixmap r = track_img.transformed(transform);
-  int x = (r.width() - track_img.width()) / 2;
-  int y = (r.height() - track_img.height()) / 2;
-  track->setPixmap(r.copy(x, y, track_img.width(), track_img.height()));
+  QPixmap r = track_img.transformed(transform.rotate(5), Qt::SmoothTransformation);
+  int x = (r.width() - track->width()) / 2;
+  int y = (r.height() - track->height()) / 2;
+  track->setPixmap(r.copy(x, y, track->width(), track->height()));
 };
 
 void Spinner::update(int n) {