Diffstat (limited to 'noncore/styles/liquid/liquid.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index ba732aa..c8f8d20 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -2007,2 +2007,11 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2007 | 2007 | ||
2008 | QPixmap *dummy = 0; | ||
2009 | |||
2010 | if ( mi-> pixmap ( ) && !mi-> pixmap ( )-> isNull ( )) { | ||
2011 | dummy = new QPixmap ( mi-> pixmap ( )-> size ( )); | ||
2012 | QBitmap dummy_mask ( dummy-> size ( )); | ||
2013 | dummy_mask. fill ( color1 ); | ||
2014 | dummy-> setMask ( dummy_mask ); | ||
2015 | } | ||
2016 | |||
2008 | if(active){ | 2017 | if(active){ |
@@ -2011,3 +2020,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2011 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2020 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2012 | g, mi->isEnabled(), NULL, mi->text(), | 2021 | g, mi->isEnabled(), dummy, mi->text(), |
2013 | -1, &shadow); | 2022 | -1, &shadow); |
@@ -2015,3 +2024,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2015 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2024 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2016 | g, mi->isEnabled(), NULL, mi->text(), | 2025 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2017 | -1, &g.text()); | 2026 | -1, &g.text()); |
@@ -2021,3 +2030,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2021 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2030 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2022 | g, mi->isEnabled(), NULL, mi->text(), | 2031 | g, mi->isEnabled(), dummy, mi->text(), |
2023 | -1, &shadow); | 2032 | -1, &shadow); |
@@ -2025,5 +2034,6 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2025 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2034 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2026 | g, mi->isEnabled(), NULL, mi->text(), | 2035 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2027 | -1, &g.text()); | 2036 | -1, &g.text()); |
2028 | } | 2037 | } |
2038 | delete dummy; | ||
2029 | } | 2039 | } |
@@ -2034,3 +2044,3 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | |||
2034 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2044 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2035 | g, mi->isEnabled(), NULL, mi->text(), | 2045 | g, mi->isEnabled(), mi-> pixmap ( ), mi->text(), |
2036 | -1, &g.text()); | 2046 | -1, &g.text()); |