summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp4
1 files changed, 2 insertions, 2 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
@@ -1739,521 +1739,521 @@ void LiquidStyle::drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g,
{
if(horiz){
if(r.width() >= 15){
int y = r.y()+3;
int x = r.x() + (r.width()-7)/2;
int y2 = r.bottom()-3;
p->setPen(g.light());
p->drawLine(x, y, x, y2);
p->drawLine(x+3, y, x+3, y2);
p->drawLine(x+6, y, x+6, y2);
p->setPen(g.mid());
p->drawLine(x+1, y, x+1, y2);
p->drawLine(x+4, y, x+4, y2);
p->drawLine(x+7, y, x+7, y2);
}
}
else{
if(r.height() >= 15){
int x = r.x()+3;
int y = r.y() + (r.height()-7)/2;
int x2 = r.right()-3;
p->setPen(g.light());
p->drawLine(x, y, x2, y);
p->drawLine(x, y+3, x2, y+3);
p->drawLine(x, y+6, x2, y+6);
p->setPen(g.mid());
p->drawLine(x, y+1, x2, y+1);
p->drawLine(x, y+4, x2, y+4);
p->drawLine(x, y+7, x2, y+7);
}
}
}
void LiquidStyle::scrollBarMetrics(const QScrollBar *sb, int &sliderMin,
int &sliderMax, int &sliderLength,
int &buttonDim)
{
int maxLength;
int b = 0;
bool horiz = sb->orientation() == QScrollBar::Horizontal;
int length = horiz ? sb->width() : sb->height();
int extent = horiz ? sb->height() : sb->width();
if ( length > ( extent - b*2 - 1 )*2 + b*2 )
buttonDim = extent - b*2;
else
buttonDim = ( length - b*2 )/2 - 1;
sliderMin = b + 0; // buttonDim;
maxLength = length - b*2 - buttonDim*2; // 3;
if ( sb->maxValue() == sb->minValue() ) {
sliderLength = maxLength;
} else {
sliderLength = (sb->pageStep()*maxLength)/
(sb->maxValue()-sb->minValue()+sb->pageStep());
uint range = sb->maxValue()-sb->minValue();
if ( sliderLength < 9 || range > INT_MAX/2 )
sliderLength = 9;
if ( sliderLength > maxLength )
sliderLength = maxLength;
}
sliderMax = sliderMin + maxLength - sliderLength;
}
QStyle::ScrollControl LiquidStyle::scrollBarPointOver(const QScrollBar *sb,
int sliderStart,
const QPoint &p)
{
if ( !sb->rect().contains( p ) )
return NoScroll;
int sliderMin, sliderMax, sliderLength, buttonDim, pos;
scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
pos = (sb->orientation() == QScrollBar::Horizontal)? p.x() : p.y();
if ( pos < sliderMin )
return SubLine;
if ( pos < sliderStart )
return SubPage;
if ( pos < sliderStart + sliderLength )
return Slider;
if ( pos < sliderMax + sliderLength)
return AddPage;
if(pos > sliderMax + sliderLength + 16)
return AddLine;
return SubLine;
}
#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
QSize LiquidStyle::exclusiveIndicatorSize() const
{
return(QSize(16, 16));
}
void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
int /*h*/, const QColorGroup &/*g*/, bool on,
bool down, bool)
{
bool isHover = highlightWidget == p->device();
bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
&& ((QWidget*)p->device())->autoMask();
if(isMasked){
if(on || down){
p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioDownHover) :
*getPixmap(HTMLRadioDown));
}
else
p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioHover) :
*getPixmap(HTMLRadio));
}
else{
if(on || down){
p->drawPixmap(x, y, isHover ? *getPixmap(RadioOnHover) :
*getPixmap(RadioOn));
}
else
p->drawPixmap(x, y, isHover ? *getPixmap(RadioOffHover) :
*getPixmap(RadioOff));
}
}
void LiquidStyle::drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w,
int h, bool)
{
p->fillRect(x, y, w, h, Qt::color0);
p->setPen(Qt::color1);
p->drawPixmap(x, y, *getPixmap(RadioOn)->mask());
}
QSize LiquidStyle::indicatorSize() const
{
return(QSize(20, 22));
}
void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
const QColorGroup &/*g*/, int state, bool /*down*/, bool)
{
bool isHover = highlightWidget == p->device();
bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
&& ((QWidget*)p->device())->autoMask();
if(isMasked){
if(state != QButton::Off){
p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBDownHover) :
*getPixmap(HTMLCBDown));
}
else
p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBHover) :
*getPixmap(HTMLCB));
}
else{
if(state != QButton::Off){
p->drawPixmap(x, y, isHover ? *getPixmap(CBDownHover) :
*getPixmap(CBDown));
/* Todo - tristate
if(state == QButton::On){
p->setPen(Qt::black);
p->drawPixmap(3, 3, xBmp);
}
else{
p->setPen(g.dark());
p->drawRect(x+2, y+2, w-4, h-4);
p->setPen(Qt::black);
p->drawLine(x+3, (y+h)/2-2, x+w-4, (y+h)/2-2);
p->drawLine(x+3, (y+h)/2, x+w-4, (y+h)/2);
p->drawLine(x+3, (y+h)/2+2, x+w-4, (y+h)/2+2);
}*/
}
else
p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB));
}
}
void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
int /*state*/)
{
// needed for some reason by KHtml, even tho it's all filled ;P
p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
}
void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
const QColorGroup &/*g*/, Orientation orient,
bool, bool)
{
QWidget *parent = (QWidget *)p->device();
p->setBrushOrigin(parent->pos());
parent->erase(x, y, w, h);
p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
*getPixmap(VSlider));
}
void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
Orientation orient, bool, bool)
{
p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
*getPixmap(VSlider)->mask());
}
int LiquidStyle::sliderLength() const
{
return(10);
}
#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x,
int y, int w, int h, const QColorGroup &g,
bool enabled, const QBrush *)
{
static const QCOORD u_arrow[]={3,1, 4,1, 2,2, 5,2, 1,3, 6,3, 0,4, 7,4, 0,5, 7,5};
static const QCOORD d_arrow[]={0,2, 7,2, 0,3, 7,3, 1,4, 6,4, 2,5, 5,5, 3,6, 4,6};
static const QCOORD l_arrow[]={1,3, 1,4, 2,2, 2,5, 3,1, 3,6, 4,0, 4,7, 5,0, 5,7};
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};
p->setPen(enabled ? on ? g.light() : g.buttonText() : g.mid());
if(w > 8){
x = x + (w-8)/2;
y = y + (h-8)/2;
}
QPointArray a;
switch(type){
case Qt::UpArrow:
a.setPoints(QCOORDARRLEN(u_arrow), u_arrow);
break;
case Qt::DownArrow:
a.setPoints(QCOORDARRLEN(d_arrow), d_arrow);
break;
case Qt::LeftArrow:
a.setPoints(QCOORDARRLEN(l_arrow), l_arrow);
break;
default:
a.setPoints(QCOORDARRLEN(r_arrow), r_arrow);
break;
}
a.translate(x, y);
p->drawLineSegments(a);
}
void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active )
{
+ if(active){
x -= 2; // Bug in Qt/E
y -= 2;
w += 2;
h += 2;
+ }
p-> fillRect ( x, y, w, h, g.brush(QColorGroup::Background));
- w -= 2;
-
if(menuHandler->useShadowText()){
QColor shadow;
if(p->device() && p->device()->devType() == QInternal::Widget &&
((QWidget *)p->device())->inherits("QMenuBar")){
shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
g.background().dark(130);
}
else
shadow = g.background().dark(130);
if(active){
drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background());
QApplication::style().drawItem(p, x+1, y+1, w, h,
AlignCenter|ShowPrefix|DontClip|SingleLine,
g, mi->isEnabled(), NULL, mi->text(),
-1, &shadow);
QApplication::style().drawItem(p, x, y, w, h,
AlignCenter|ShowPrefix|DontClip|SingleLine,
g, mi->isEnabled(), NULL, mi->text(),
-1, &g.text());
}
else{
QApplication::style().drawItem(p, x+1, y+1, w, h,
AlignCenter|ShowPrefix|DontClip|SingleLine,
g, mi->isEnabled(), NULL, mi->text(),
-1, &shadow);
QApplication::style().drawItem(p, x, y, w, h,
AlignCenter|ShowPrefix|DontClip|SingleLine,
g, mi->isEnabled(), NULL, mi->text(),
-1, &g.text());
}
}
else{
if(active)
drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background());
QApplication::style().drawItem(p, x, y, w, h,
AlignCenter|ShowPrefix|DontClip|SingleLine,
g, mi->isEnabled(), NULL, mi->text(),
-1, &g.text());
}
}
void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
const QColorGroup &g, int /*lineWidth*/,
const QBrush * /*fill*/)
{
QColor c;
switch(menuHandler->transType()){
case None:
case StippledBg:
case TransStippleBg:
c = g.background();
break;
case StippledBtn:
case TransStippleBtn:
c = g.button();
break;
default:
c = menuHandler->bgColor();
}
p->setPen(c.dark(140));
p->drawRect(x, y, w, h);
p->setPen(c.light(120));
p->drawRect(x+1, y+1, w-2, h-2);
}
void LiquidStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
int tab, QMenuItem* mi,
const QPalette& pal, bool act,
bool enabled, int x, int y, int w, int h)
{
static const int motifItemFrame = 2;
static const int motifItemHMargin = 3;
static const int motifItemVMargin = 2;
static const int motifArrowHMargin = 6;
static const int windowsRightBorder = 12;
maxpmw = QMAX( maxpmw, 20 );
bool dis = !enabled;
QColorGroup itemg = dis ? pal.disabled() : pal.active();
int checkcol = maxpmw;
if(act){
// FIXME
drawClearBevel(p, x, y, w, h, itemg.button(), itemg.background());
}
//else if(((QWidget*)p->device())->backgroundPixmap()){
// p->drawPixmap(x, y, *((QWidget*)p->device())->backgroundPixmap(),
// x, y, w, h);
//}
else{
if(menuHandler->transType() == None){
p->fillRect(x, y, w, h, pal.active().background());
}
else if(menuHandler->transType() == StippledBg){
p->fillRect(x, y, w, h, bgBrush);
}
else if(menuHandler->transType() == StippledBtn){
p->fillRect(x, y, w, h, menuBrush);
}
else{
QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId());
if(pix)
p->drawPixmap(x, y, *pix, x, y, w, h);
}
}
if(!mi)
return;
QColor discol;
if (dis) {
discol = itemg.mid();
p->setPen(discol);
}
QColorGroup cg2(itemg);
if(menuHandler->transType() == Custom){
cg2.setColor(QColorGroup::Foreground, menuHandler->textColor());
cg2.setColor(QColorGroup::Text, menuHandler->textColor());
cg2.setColor(QColorGroup::Light, menuHandler->textColor().light(120));
cg2.setColor(QColorGroup::Mid, menuHandler->textColor().dark(120));
}
else{
cg2 = QColorGroup(discol, itemg.highlight(), black, black,
dis ? discol : black, discol, black);
}
if(mi->isSeparator()){
QColor c;
switch(menuHandler->transType()){
case None:
case StippledBg:
case TransStippleBg:
c = QApplication::palette().active().background();
break;
case StippledBtn:
case TransStippleBtn:
c = QApplication::palette().active().button();
break;
default:
c = menuHandler->bgColor();
}
p->setPen(c.dark(140));
p->drawLine(x, y, x+w, y );
p->setPen(c.light(115));
p->drawLine(x, y+1, x+w, y+1 );
return;
}
if(mi->iconSet()) {
QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal;
if (!dis)
mode = QIconSet::Active;
QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode);
int pixw = pixmap.width();
int pixh = pixmap.height();
QRect cr(x, y, checkcol, h);
QRect pmr(0, 0, pixw, pixh);
pmr.moveCenter( cr.center() );
p->setPen(itemg.highlightedText());
p->drawPixmap(pmr.topLeft(), pixmap );
}
else if(checkable) {
int mw = checkcol + motifItemFrame;
int mh = h - 2*motifItemFrame;
if (mi->isChecked()){
drawCheckMark( p, x + motifItemFrame,
y+motifItemFrame, mw, mh, cg2, act, dis );
}
}
if(menuHandler->transType() == Custom)
p->setPen(menuHandler->textColor());
else
p->setPen(itemg.text());
int xm = motifItemFrame + checkcol + motifItemHMargin;
QString s = mi->text();
if (!s.isNull()) {
int t = s.find( '\t' );
int m = motifItemVMargin;
const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
QPen oldPen = p->pen();
if(menuHandler->useShadowText()){
if(menuHandler->transType() == Custom)
p->setPen(menuHandler->bgColor().dark(130));
else if(menuHandler->transType() == StippledBtn ||
menuHandler->transType() == TransStippleBtn)
p->setPen(itemg.button().dark(130));
else
p->setPen(bgBrush.color().dark(130));
if (t >= 0) {
p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+2,
y+m+2, tab-1, h-2*m-1, text_flags, s.mid( t+1 ));
}
p->drawText(x+xm+1, y+m+1, w-xm-tab, h-2*m-1, text_flags, s, t);
}
p->setPen(oldPen);
if (t >= 0) {
p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
}
p->drawText(x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t);
}
else if (mi->pixmap()) {
QPixmap *pixmap = mi->pixmap();
if (pixmap->depth() == 1)
p->setBackgroundMode(OpaqueMode);
p->drawPixmap( x+xm, y+motifItemFrame, *pixmap);
if (pixmap->depth() == 1)
p->setBackgroundMode(TransparentMode);
}
if (mi->popup()) {
int dim = (h-2*motifItemFrame) / 2;
drawArrow(p, RightArrow, true,
x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
dim, dim, cg2, TRUE);
}
}
int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
const QFontMetrics &fm)
{
if (mi->isSeparator())
return 2;
int h = 0;
if (mi->pixmap())
h = mi->pixmap()->height();
if (mi->iconSet())
h = QMAX(mi->iconSet()->
pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
h = QMAX(fm.height() + 4, h);
// we want a minimum size of 18
h = QMAX(h, 18);
return h;
}
void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
const QColorGroup &g, const QColor *c,
bool atBorder)
{
// are we painting a widget?
if(p->device()->devType() == QInternal::Widget){