ui: screen touch fixes (#84)

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

* keep button the same height during screen touches

* fixed height
This commit is contained in:
Jason Wen
2023-05-31 13:06:23 -04:00
committed by GitHub
parent f107f51b4a
commit 5728cd7b7a
2 changed files with 6 additions and 3 deletions
+4 -1
View File
@@ -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) {
@@ -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);