ui: screen touch fixes (commaai#84)

* ui: don't toggle map if buttons are hidden * keep button the same height during screen touches * fixed height
carleeno · May 31, 2023 · 5728cd7 · 5728cd7
1 parent f107f51
commit 5728cd7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
@@ -182,7 +182,10 @@ void OnroadWindow::mousePressEvent(QMouseEvent* e) {
     propagate_event = false;
   }
   else if (map != nullptr) {
-    map->setVisible(!sidebarVisible && !map->isVisible());
+    if ((uiState()->scene.sleep_btn != 0 && uiState()->scene.sleep_btn_opacity != 0) ||
+        (uiState()->scene.sleep_time != 0 && uiState()->scene.onroadScreenOff != -2)) {
+      map->setVisible(!sidebarVisible && !map->isVisible());
+    }
   }
   // propagation event to parent(HomeWindow)
   if (propagate_event) {

diff --git a/selfdrive/ui/qt/screenrecorder/screenrecorder.cc b/selfdrive/ui/qt/screenrecorder/screenrecorder.cc
@@ -64,8 +64,8 @@ void ScreenRecoder::paintEvent(QPaintEvent *event) {
   QPainter p(this);
   p.setRenderHint(QPainter::Antialiasing);
 
-  QPoint center(btn_size / 2 - 25, btn_size / 2 + 10 - uiState()->scene.rn_offset);
-  QRect rec_btn(36 - 25, 36 + 10 - uiState()->scene.rn_offset, 120, 120);
+  QPoint center(btn_size / 2 - 25, btn_size / 2 + 10 - 30);
+  QRect rec_btn(36 - 25, 36 + 10 - 30, 120, 120);
 
   p.setOpacity(1.0);
   p.setPen(Qt::NoPen);