From 7f662cfd18de09741997156dc040e9b04326c499 Mon Sep 17 00:00:00 2001 From: Antoine Girard-Vallee Date: Thu, 10 Nov 2016 14:04:34 -0500 Subject: [PATCH 1/2] fixed desktop mode on gnome desktop --- src/desktop/UBDesktopAnnotationController.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 3544d464..9430b584 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -85,7 +85,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB #ifdef Q_OS_OSX mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true); #endif - mTransparentDrawingView->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::Window | Qt::NoDropShadowWindowHint); + mTransparentDrawingView->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::Window | Qt::NoDropShadowWindowHint | Qt::X11BypassWindowManagerHint); mTransparentDrawingView->setCacheMode(QGraphicsView::CacheNone); mTransparentDrawingView->resize(UBApplication::desktop()->width(), UBApplication::desktop()->height()); @@ -945,9 +945,20 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent) } else { - // Remove the mask - QPixmap noMask(mTransparentDrawingView->width(), mTransparentDrawingView->height()); - mTransparentDrawingView->setMask(noMask.mask()); + mMask = QPixmap(mTransparentDrawingView->width(), mTransparentDrawingView->height()); + mMask.fill(Qt::transparent); + + QPainter p; + + p.begin(&mMask); + + p.setPen(Qt::red); + p.setBrush(QBrush(Qt::red)); + + p.drawRect(mTransparentDrawingView->geometry().x(), mTransparentDrawingView->geometry().y(), mTransparentDrawingView->width(), mTransparentDrawingView->height()); + p.end(); + + mTransparentDrawingView->setMask(mMask.mask()); } } From 021849d98191153865c5206f3ee9a7bf6d2df413 Mon Sep 17 00:00:00 2001 From: Antoine Girard-Vallee Date: Thu, 10 Nov 2016 14:09:03 -0500 Subject: [PATCH 2/2] removed inserted tab --- src/desktop/UBDesktopAnnotationController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 9430b584..dee6e9c2 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -945,7 +945,7 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent) } else { - mMask = QPixmap(mTransparentDrawingView->width(), mTransparentDrawingView->height()); + mMask = QPixmap(mTransparentDrawingView->width(), mTransparentDrawingView->height()); mMask.fill(Qt::transparent); QPainter p;