-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index fc925b8..87b5488 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp | |||
@@ -1963,73 +1963,73 @@ void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x, | |||
1963 | static const QCOORD r_arrow[]={2,0, 2,7, 3,0, 3,7, 4,1, 4,6, 5,2, 5,5, 6,3, 6,4}; | 1963 | static const QCOORD r_arrow[]={2,0, 2,7, 3,0, 3,7, 4,1, 4,6, 5,2, 5,5, 6,3, 6,4}; |
1964 | 1964 | ||
1965 | p->setPen(enabled ? on ? g.light() : g.buttonText() : g.mid()); | 1965 | p->setPen(enabled ? on ? g.light() : g.buttonText() : g.mid()); |
1966 | if(w > 8){ | 1966 | if(w > 8){ |
1967 | x = x + (w-8)/2; | 1967 | x = x + (w-8)/2; |
1968 | y = y + (h-8)/2; | 1968 | y = y + (h-8)/2; |
1969 | } | 1969 | } |
1970 | 1970 | ||
1971 | QPointArray a; | 1971 | QPointArray a; |
1972 | switch(type){ | 1972 | switch(type){ |
1973 | case Qt::UpArrow: | 1973 | case Qt::UpArrow: |
1974 | a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); | 1974 | a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); |
1975 | break; | 1975 | break; |
1976 | case Qt::DownArrow: | 1976 | case Qt::DownArrow: |
1977 | a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); | 1977 | a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); |
1978 | break; | 1978 | break; |
1979 | case Qt::LeftArrow: | 1979 | case Qt::LeftArrow: |
1980 | a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); | 1980 | a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); |
1981 | break; | 1981 | break; |
1982 | default: | 1982 | default: |
1983 | a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); | 1983 | a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); |
1984 | break; | 1984 | break; |
1985 | } | 1985 | } |
1986 | 1986 | ||
1987 | a.translate(x, y); | 1987 | a.translate(x, y); |
1988 | p->drawLineSegments(a); | 1988 | p->drawLineSegments(a); |
1989 | } | 1989 | } |
1990 | 1990 | ||
1991 | 1991 | ||
1992 | void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, | 1992 | void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, |
1993 | QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) | 1993 | QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) |
1994 | { | 1994 | { |
1995 | x -= 2; // Bug in Qt/E | 1995 | if(active){ |
1996 | y -= 2; | 1996 | x -= 2; // Bug in Qt/E |
1997 | w += 2; | 1997 | y -= 2; |
1998 | h += 2; | 1998 | w += 2; |
1999 | h += 2; | ||
2000 | } | ||
1999 | 2001 | ||
2000 | p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); | 2002 | p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background)); |
2001 | 2003 | ||
2002 | w -= 2; | ||
2003 | |||
2004 | if(menuHandler->useShadowText()){ | 2004 | if(menuHandler->useShadowText()){ |
2005 | QColor shadow; | 2005 | QColor shadow; |
2006 | if(p->device() && p->device()->devType() == QInternal::Widget && | 2006 | if(p->device() && p->device()->devType() == QInternal::Widget && |
2007 | ((QWidget *)p->device())->inherits("QMenuBar")){ | 2007 | ((QWidget *)p->device())->inherits("QMenuBar")){ |
2008 | shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : | 2008 | shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : |
2009 | g.background().dark(130); | 2009 | g.background().dark(130); |
2010 | } | 2010 | } |
2011 | else | 2011 | else |
2012 | shadow = g.background().dark(130); | 2012 | shadow = g.background().dark(130); |
2013 | 2013 | ||
2014 | if(active){ | 2014 | if(active){ |
2015 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); | 2015 | drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); |
2016 | QApplication::style().drawItem(p, x+1, y+1, w, h, | 2016 | QApplication::style().drawItem(p, x+1, y+1, w, h, |
2017 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2017 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2018 | g, mi->isEnabled(), NULL, mi->text(), | 2018 | g, mi->isEnabled(), NULL, mi->text(), |
2019 | -1, &shadow); | 2019 | -1, &shadow); |
2020 | QApplication::style().drawItem(p, x, y, w, h, | 2020 | QApplication::style().drawItem(p, x, y, w, h, |
2021 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2021 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2022 | g, mi->isEnabled(), NULL, mi->text(), | 2022 | g, mi->isEnabled(), NULL, mi->text(), |
2023 | -1, &g.text()); | 2023 | -1, &g.text()); |
2024 | } | 2024 | } |
2025 | else{ | 2025 | else{ |
2026 | QApplication::style().drawItem(p, x+1, y+1, w, h, | 2026 | QApplication::style().drawItem(p, x+1, y+1, w, h, |
2027 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2027 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2028 | g, mi->isEnabled(), NULL, mi->text(), | 2028 | g, mi->isEnabled(), NULL, mi->text(), |
2029 | -1, &shadow); | 2029 | -1, &shadow); |
2030 | QApplication::style().drawItem(p, x, y, w, h, | 2030 | QApplication::style().drawItem(p, x, y, w, h, |
2031 | AlignCenter|ShowPrefix|DontClip|SingleLine, | 2031 | AlignCenter|ShowPrefix|DontClip|SingleLine, |
2032 | g, mi->isEnabled(), NULL, mi->text(), | 2032 | g, mi->isEnabled(), NULL, mi->text(), |
2033 | -1, &g.text()); | 2033 | -1, &g.text()); |
2034 | } | 2034 | } |
2035 | } | 2035 | } |