From 5728cd7b7a7820b3d042ff075e462adb6b15fc19 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Wed, 31 May 2023 13:06:23 -0400
Subject: [PATCH] ui: screen touch fixes (#84)

* ui: don't toggle map if buttons are hidden

* keep button the same height during screen touches

* fixed height
---
 selfdrive/ui/qt/onroad.cc                        | 5 ++++-
 selfdrive/ui/qt/screenrecorder/screenrecorder.cc | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index 7f5d0136eb..99638c4773 100644
--- 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
index da05ed32cb..ab3557ae2b 100644
--- 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);