[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2010-05-14 23:09:31
Message-ID: 20100514230931.0ECCDAC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1126820 by hein:

Fix title bar mask calculation when the theme's corner images don't
have an alpha channel.


 M  +2 -0      ChangeLog  
 M  +5 -2      app/titlebar.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #1126819:1126820
@@ -18,6 +18,8 @@
   area wouldn't actually show the corresponding terminal(s).
 * Fixed a bug causing the empty area of the tab bar to become draggable as
   if if was the last tab that had been clicked.
+* Fixed a bug causing the title bar corner images of a theme not to be shown
+  when they don't have an alpha channel.
 
 
 Changes in 2.9.6:
--- trunk/extragear/utils/yakuake/app/titlebar.cpp #1126819:1126820
@@ -123,12 +123,15 @@
     const QPixmap& leftCornerImage = m_skin->titleBarLeftCornerImage();
     const QPixmap& rightCornerImage = m_skin->titleBarRightCornerImage();
 
-    QRegion mask = QRegion(leftCornerImage.mask());
+    QRegion leftCornerRegion = leftCornerImage.hasAlpha() ? \
QRegion(leftCornerImage.mask()) : QRegion(leftCornerImage.rect()); +    QRegion \
rightCornerRegion = rightCornerImage.hasAlpha() ? QRegion(rightCornerImage.mask()) : \
QRegion(rightCornerImage.rect());  
+    QRegion mask = leftCornerRegion;
+
     mask += QRegion(QRect(0, 0, width() - leftCornerImage.width() - \
rightCornerImage.width(),   height())).translated(leftCornerImage.width(), 0);
 
-    mask += QRegion(rightCornerImage.mask()).translated(width() - \
rightCornerImage.width(), 0); +    mask += rightCornerRegion.translated(width() - \
rightCornerImage.width(), 0);  
     setMask(mask);
 }


[prev in list] [next in list] [prev in thread] [next in thread]