X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=1d55e14f7c91f20f55d09bffc1d4540d8819ddb6;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hp=6c7df488e3492c6e87d893488af811d40c691d55;hpb=84a0d458a4b04141dd45af6dec44d36782ee163e;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 6c7df488..1d55e14f 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -128,8 +128,9 @@ View::View(SigSession &session, QWidget *parent) :
 	// which were created before this object came into being
 	signals_changed();
 
-	// make sure the cursorheader is over the ruler
+	// make sure the transparent widgets are on the top
 	_cursorheader->raise();
+	_header->raise();
 }
 
 SigSession& View::session()
@@ -412,7 +413,8 @@ void View::update_scroll()
 
 void View::update_layout()
 {
-	setViewportMargins(_header->sizeHint().width(),
+	setViewportMargins(
+		_header->sizeHint().width() - pv::view::Header::BaselineOffset,
 		_ruler->sizeHint().height(), 0, 0);
 	_ruler->setGeometry(_viewport->x(), 0,
 		_viewport->width(), _viewport->y());
@@ -421,7 +423,7 @@ void View::update_layout()
 		_ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
 		_viewport->width(), _cursorheader->sizeHint().height());
 	_header->setGeometry(0, _viewport->y(),
-		_viewport->x(), _viewport->height());
+		_header->sizeHint().width(), _viewport->height());
 	update_scroll();
 }
 
@@ -467,6 +469,9 @@ bool View::viewportEvent(QEvent *e)
 	case QEvent::MouseButtonDblClick:
 	case QEvent::MouseMove:
 	case QEvent::Wheel:
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
 		return false;
 
 	default: