summaryrefslogtreecommitdiff
authorleseb <leseb>2002-07-13 12:37:36 (UTC)
committer leseb <leseb>2002-07-13 12:37:36 (UTC)
commit6337e3836497ede8bb47aea5c7b65f4f8c08c4cd (patch) (unidiff)
tree3a2b4d0d2ee302b1c01fbe8c0f3fbf40f8a30b3b
parent804c1ce9554548d1c0f46d28eb1b8f63b4341fdb (diff)
downloadopie-6337e3836497ede8bb47aea5c7b65f4f8c08c4cd.zip
opie-6337e3836497ede8bb47aea5c7b65f4f8c08c4cd.tar.gz
opie-6337e3836497ede8bb47aea5c7b65f4f8c08c4cd.tar.bz2
Small fix in drawing menubar
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp12
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
@@ -1483,1033 +1483,1033 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
1483 int sliderStart, uint controls, 1483 int sliderStart, uint controls,
1484 uint activeControl) 1484 uint activeControl)
1485{ 1485{
1486 bool isHover = highlightWidget == p->device(); 1486 bool isHover = highlightWidget == p->device();
1487 int sliderMin, sliderMax, sliderLength, buttonDim; 1487 int sliderMin, sliderMax, sliderLength, buttonDim;
1488 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); 1488 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
1489 1489
1490 if (sliderStart > sliderMax) 1490 if (sliderStart > sliderMax)
1491 sliderStart = sliderMax; 1491 sliderStart = sliderMax;
1492 1492
1493 bool horiz = sb->orientation() == QScrollBar::Horizontal; 1493 bool horiz = sb->orientation() == QScrollBar::Horizontal;
1494 QColorGroup g = sb->colorGroup(); 1494 QColorGroup g = sb->colorGroup();
1495 QRect addB, subHC, subB; 1495 QRect addB, subHC, subB;
1496 QRect addPageR, subPageR, sliderR; 1496 QRect addPageR, subPageR, sliderR;
1497 int addX, addY, subX, subY; 1497 int addX, addY, subX, subY;
1498 int len = horiz ? sb->width() : sb->height(); 1498 int len = horiz ? sb->width() : sb->height();
1499 int extent = horiz ? sb->height() : sb->width(); 1499 int extent = horiz ? sb->height() : sb->width();
1500 1500
1501 // a few apps (ie: KSpread), are broken and use a hardcoded scrollbar 1501 // a few apps (ie: KSpread), are broken and use a hardcoded scrollbar
1502 // extent of 16. Luckily, most apps (ie: Kate), seem fixed by now. 1502 // extent of 16. Luckily, most apps (ie: Kate), seem fixed by now.
1503 bool brokenApp; 1503 bool brokenApp;
1504 if(extent == 16) 1504 if(extent == 16)
1505 brokenApp = true; 1505 brokenApp = true;
1506 else 1506 else
1507 brokenApp = false; 1507 brokenApp = false;
1508 1508
1509 if (horiz) { 1509 if (horiz) {
1510 subY = addY = ( extent - buttonDim ) / 2; 1510 subY = addY = ( extent - buttonDim ) / 2;
1511 subX = 0; 1511 subX = 0;
1512 addX = len - buttonDim; 1512 addX = len - buttonDim;
1513 if(sbBuffer.size() != sb->size()) 1513 if(sbBuffer.size() != sb->size())
1514 sbBuffer.resize(sb->size()); 1514 sbBuffer.resize(sb->size());
1515 } 1515 }
1516 else { 1516 else {
1517 subX = addX = ( extent - buttonDim ) / 2; 1517 subX = addX = ( extent - buttonDim ) / 2;
1518 subY = 0; 1518 subY = 0;
1519 addY = len - buttonDim; 1519 addY = len - buttonDim;
1520 if(sbBuffer.size() != sb->size()) 1520 if(sbBuffer.size() != sb->size())
1521 sbBuffer.resize(sb->size()); 1521 sbBuffer.resize(sb->size());
1522 } 1522 }
1523 subB.setRect( subX,subY,0,0); // buttonDim,buttonDim ); 1523 subB.setRect( subX,subY,0,0); // buttonDim,buttonDim );
1524 addB.setRect( addX,addY,buttonDim,buttonDim ); 1524 addB.setRect( addX,addY,buttonDim,buttonDim );
1525 if(horiz) 1525 if(horiz)
1526 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); 1526 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
1527 else 1527 else
1528 subHC.setRect(addX,addY-buttonDim,buttonDim,buttonDim ); 1528 subHC.setRect(addX,addY-buttonDim,buttonDim,buttonDim );
1529 1529
1530 int sliderEnd = sliderStart + sliderLength; 1530 int sliderEnd = sliderStart + sliderLength;
1531 int sliderW = extent; 1531 int sliderW = extent;
1532 1532
1533 if (horiz) { 1533 if (horiz) {
1534 subPageR.setRect( subB.right() + 1, 0, 1534 subPageR.setRect( subB.right() + 1, 0,
1535 sliderStart - subB.right() - 1 , sliderW ); 1535 sliderStart - subB.right() - 1 , sliderW );
1536 addPageR.setRect( sliderEnd, 0, addX - sliderEnd - buttonDim, sliderW ); 1536 addPageR.setRect( sliderEnd, 0, addX - sliderEnd - buttonDim, sliderW );
1537 sliderR .setRect( sliderStart, 0, sliderLength, sliderW ); 1537 sliderR .setRect( sliderStart, 0, sliderLength, sliderW );
1538 } 1538 }
1539 else { 1539 else {
1540 subPageR.setRect( 0, subB.bottom() + 1, sliderW, 1540 subPageR.setRect( 0, subB.bottom() + 1, sliderW,
1541 sliderStart - subB.bottom() - 1 ); 1541 sliderStart - subB.bottom() - 1 );
1542 addPageR.setRect( 0, sliderEnd, sliderW, addY - buttonDim - sliderEnd); 1542 addPageR.setRect( 0, sliderEnd, sliderW, addY - buttonDim - sliderEnd);
1543 sliderR .setRect( 0, sliderStart, sliderW, sliderLength ); 1543 sliderR .setRect( 0, sliderStart, sliderW, sliderLength );
1544 } 1544 }
1545 1545
1546 bool maxed = sb->maxValue() == sb->minValue(); 1546 bool maxed = sb->maxValue() == sb->minValue();
1547 1547
1548 QPainter painter; 1548 QPainter painter;
1549 if(!horiz){ 1549 if(!horiz){
1550 painter.begin(&sbBuffer); 1550 painter.begin(&sbBuffer);
1551 QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1); 1551 QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1);
1552 if(sliderR.height() >= 8){ 1552 if(sliderR.height() >= 8){
1553 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, 1553 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
1554 13, 8); 1554 13, 8);
1555 painter.drawPixmap(bgR.x()+1, bgR.y(), *getPixmap(VSBSliderTopBg)); 1555 painter.drawPixmap(bgR.x()+1, bgR.y(), *getPixmap(VSBSliderTopBg));
1556 painter.drawTiledPixmap(bgR.x()+1, bgR.y()+8, 13, 1556 painter.drawTiledPixmap(bgR.x()+1, bgR.y()+8, 13,
1557 bgR.height()-16, *getPixmap(VSBSliderMidBg)); 1557 bgR.height()-16, *getPixmap(VSBSliderMidBg));
1558 painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *vsbSliderFillPix, 1558 painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *vsbSliderFillPix,
1559 0, 0, 13, 8); 1559 0, 0, 13, 8);
1560 painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *getPixmap(VSBSliderBtmBg)); 1560 painter.drawPixmap(bgR.x()+1, bgR.bottom()-8, *getPixmap(VSBSliderBtmBg));
1561 } 1561 }
1562 else{ 1562 else{
1563 painter.drawTiledPixmap(bgR.x()+1, bgR.y(), 13, bgR.height(), 1563 painter.drawTiledPixmap(bgR.x()+1, bgR.y(), 13, bgR.height(),
1564 *getPixmap(VSBSliderMidBg)); 1564 *getPixmap(VSBSliderMidBg));
1565 painter.setPen(g.background().dark(210)); 1565 painter.setPen(g.background().dark(210));
1566 painter.drawRect(bgR.x()+1, bgR.y(), 13, bgR.height()-1); 1566 painter.drawRect(bgR.x()+1, bgR.y(), 13, bgR.height()-1);
1567 painter.setPen(g.mid()); 1567 painter.setPen(g.mid());
1568 painter.drawPoint(bgR.x()+1, bgR.y()); 1568 painter.drawPoint(bgR.x()+1, bgR.y());
1569 painter.drawPoint(bgR.x()+13, bgR.y()); 1569 painter.drawPoint(bgR.x()+13, bgR.y());
1570 painter.drawPoint(bgR.x()+1, bgR.bottom()-1); 1570 painter.drawPoint(bgR.x()+1, bgR.bottom()-1);
1571 painter.drawPoint(bgR.x()+13, bgR.bottom()-1); 1571 painter.drawPoint(bgR.x()+13, bgR.bottom()-1);
1572 } 1572 }
1573 if(controls & Slider){ 1573 if(controls & Slider){
1574 if(sliderR.height() >= 16){ 1574 if(sliderR.height() >= 16){
1575 painter.drawPixmap(sliderR.x()+1, sliderR.y(), 1575 painter.drawPixmap(sliderR.x()+1, sliderR.y(),
1576 isHover ? *getPixmap(VSBSliderTopHover): 1576 isHover ? *getPixmap(VSBSliderTopHover):
1577 *getPixmap(VSBSliderTop)); 1577 *getPixmap(VSBSliderTop));
1578 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+8, 13, 1578 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+8, 13,
1579 sliderR.height()-16, isHover ? 1579 sliderR.height()-16, isHover ?
1580 *getPixmap(VSBSliderMidHover) : 1580 *getPixmap(VSBSliderMidHover) :
1581 *getPixmap(VSBSliderMid)); 1581 *getPixmap(VSBSliderMid));
1582 painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8, 1582 painter.drawPixmap(sliderR.x()+1, sliderR.bottom()-8,
1583 isHover ? *getPixmap(VSBSliderBtmHover) : 1583 isHover ? *getPixmap(VSBSliderBtmHover) :
1584 *getPixmap(VSBSliderBtm)); 1584 *getPixmap(VSBSliderBtm));
1585 } 1585 }
1586 else if(sliderR.height() >= 8){ 1586 else if(sliderR.height() >= 8){
1587 int m = sliderR.height()/2; 1587 int m = sliderR.height()/2;
1588 painter.drawPixmap(sliderR.x()+1, sliderR.y(), 1588 painter.drawPixmap(sliderR.x()+1, sliderR.y(),
1589 isHover ? *getPixmap(VSBSliderTopHover): 1589 isHover ? *getPixmap(VSBSliderTopHover):
1590 *getPixmap(VSBSliderTop), 0, 0, 13, m); 1590 *getPixmap(VSBSliderTop), 0, 0, 13, m);
1591 painter.drawPixmap(sliderR.x()+1, sliderR.y()+m, 1591 painter.drawPixmap(sliderR.x()+1, sliderR.y()+m,
1592 isHover ? *getPixmap(VSBSliderBtmHover): 1592 isHover ? *getPixmap(VSBSliderBtmHover):
1593 *getPixmap(VSBSliderBtm), 0, 8-m, 13, m); 1593 *getPixmap(VSBSliderBtm), 0, 8-m, 13, m);
1594 } 1594 }
1595 else{ 1595 else{
1596 painter.setPen(g.button().dark(210)); 1596 painter.setPen(g.button().dark(210));
1597 drawRoundRect(&painter, sliderR.x()+1, sliderR.y(), 1597 drawRoundRect(&painter, sliderR.x()+1, sliderR.y(),
1598 13, sliderR.height()); 1598 13, sliderR.height());
1599 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1, 1599 painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1,
1600 11, sliderR.height()-2, 1600 11, sliderR.height()-2,
1601 isHover ? *getPixmap(VSBSliderMidHover) : 1601 isHover ? *getPixmap(VSBSliderMidHover) :
1602 *getPixmap(VSBSliderMid), 1, 0); 1602 *getPixmap(VSBSliderMid), 1, 0);
1603 } 1603 }
1604 } 1604 }
1605 painter.setPen(g.mid()); 1605 painter.setPen(g.mid());
1606 painter.drawLine(bgR.x(), bgR.y(), bgR.x(), bgR.bottom()); 1606 painter.drawLine(bgR.x(), bgR.y(), bgR.x(), bgR.bottom());
1607 painter.drawLine(bgR.right(), bgR.y(), bgR.right(), bgR.bottom()); 1607 painter.drawLine(bgR.right(), bgR.y(), bgR.right(), bgR.bottom());
1608 if(brokenApp && (controls & Slider)){ 1608 if(brokenApp && (controls & Slider)){
1609 painter.setPen(g.background()); 1609 painter.setPen(g.background());
1610 painter.drawLine(bgR.right()-1, bgR.y(), bgR.right()-1, 1610 painter.drawLine(bgR.right()-1, bgR.y(), bgR.right()-1,
1611 bgR.bottom()); 1611 bgR.bottom());
1612 } 1612 }
1613 painter.end(); 1613 painter.end();
1614 } 1614 }
1615 else{ 1615 else{
1616 painter.begin(&sbBuffer); 1616 painter.begin(&sbBuffer);
1617 QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height()); 1617 QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height());
1618 if(sliderR.width() >= 8){ 1618 if(sliderR.width() >= 8){
1619 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, 1619 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
1620 8, 13); 1620 8, 13);
1621 painter.drawPixmap(bgR.x(), bgR.y()+1, *getPixmap(HSBSliderTopBg)); 1621 painter.drawPixmap(bgR.x(), bgR.y()+1, *getPixmap(HSBSliderTopBg));
1622 painter.drawTiledPixmap(bgR.x()+8, bgR.y()+1, bgR.width()-16, 1622 painter.drawTiledPixmap(bgR.x()+8, bgR.y()+1, bgR.width()-16,
1623 13, *getPixmap(HSBSliderMidBg)); 1623 13, *getPixmap(HSBSliderMidBg));
1624 painter.drawPixmap(bgR.right()-8, bgR.y()+1, *vsbSliderFillPix, 1624 painter.drawPixmap(bgR.right()-8, bgR.y()+1, *vsbSliderFillPix,
1625 0, 0, 8, 13); 1625 0, 0, 8, 13);
1626 painter.drawPixmap(bgR.right()-8, bgR.y()+1, *getPixmap(HSBSliderBtmBg)); 1626 painter.drawPixmap(bgR.right()-8, bgR.y()+1, *getPixmap(HSBSliderBtmBg));
1627 } 1627 }
1628 else{ 1628 else{
1629 painter.drawTiledPixmap(bgR.x(), bgR.y()+1, bgR.width(), 13, 1629 painter.drawTiledPixmap(bgR.x(), bgR.y()+1, bgR.width(), 13,
1630 *getPixmap(HSBSliderMidBg)); 1630 *getPixmap(HSBSliderMidBg));
1631 painter.setPen(g.background().dark(210)); 1631 painter.setPen(g.background().dark(210));
1632 painter.drawRect(bgR.x(), bgR.y()+1, bgR.width()-1, 13); 1632 painter.drawRect(bgR.x(), bgR.y()+1, bgR.width()-1, 13);
1633 painter.setPen(g.mid()); 1633 painter.setPen(g.mid());
1634 painter.drawPoint(bgR.x(), bgR.y()+1); 1634 painter.drawPoint(bgR.x(), bgR.y()+1);
1635 painter.drawPoint(bgR.x(), bgR.bottom()-1); 1635 painter.drawPoint(bgR.x(), bgR.bottom()-1);
1636 painter.drawPoint(bgR.right()-1, bgR.y()+1); 1636 painter.drawPoint(bgR.right()-1, bgR.y()+1);
1637 painter.drawPoint(bgR.right()-1, bgR.bottom()-1); 1637 painter.drawPoint(bgR.right()-1, bgR.bottom()-1);
1638 } 1638 }
1639 if(controls & Slider){ 1639 if(controls & Slider){
1640 if(sliderR.width() >= 16){ 1640 if(sliderR.width() >= 16){
1641 painter.drawPixmap(sliderR.x(), sliderR.y()+1, 1641 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
1642 isHover ? *getPixmap(HSBSliderTopHover) : 1642 isHover ? *getPixmap(HSBSliderTopHover) :
1643 *getPixmap(HSBSliderTop)); 1643 *getPixmap(HSBSliderTop));
1644 painter.drawTiledPixmap(sliderR.x()+8, sliderR.y()+1, sliderR.width()-16, 1644 painter.drawTiledPixmap(sliderR.x()+8, sliderR.y()+1, sliderR.width()-16,
1645 13, isHover ? *getPixmap(HSBSliderMidHover) : 1645 13, isHover ? *getPixmap(HSBSliderMidHover) :
1646 *getPixmap(HSBSliderMid)); 1646 *getPixmap(HSBSliderMid));
1647 painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ? 1647 painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
1648 *getPixmap(HSBSliderBtmHover) : 1648 *getPixmap(HSBSliderBtmHover) :
1649 *getPixmap(HSBSliderBtm)); 1649 *getPixmap(HSBSliderBtm));
1650 } 1650 }
1651 else if(sliderR.width() >= 8){ 1651 else if(sliderR.width() >= 8){
1652 int m = sliderR.width()/2; 1652 int m = sliderR.width()/2;
1653 painter.drawPixmap(sliderR.x(), sliderR.y()+1, 1653 painter.drawPixmap(sliderR.x(), sliderR.y()+1,
1654 isHover ? *getPixmap(HSBSliderTopHover) : 1654 isHover ? *getPixmap(HSBSliderTopHover) :
1655 *getPixmap(HSBSliderTop), 0, 0, m, 13); 1655 *getPixmap(HSBSliderTop), 0, 0, m, 13);
1656 painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ? 1656 painter.drawPixmap(sliderR.right()-8, sliderR.y()+1, isHover ?
1657 *getPixmap(HSBSliderBtmHover) : 1657 *getPixmap(HSBSliderBtmHover) :
1658 *getPixmap(HSBSliderBtm), 8-m, 0, m, 13); 1658 *getPixmap(HSBSliderBtm), 8-m, 0, m, 13);
1659 } 1659 }
1660 else{ 1660 else{
1661 painter.setPen(g.button().dark(210)); 1661 painter.setPen(g.button().dark(210));
1662 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1, 1662 drawRoundRect(&painter, sliderR.x(), sliderR.y()+1,
1663 sliderR.width(), 13); 1663 sliderR.width(), 13);
1664 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2, 1664 painter.drawTiledPixmap(sliderR.x()+1, sliderR.y()+2,
1665 sliderR.width()-2, 11, isHover ? 1665 sliderR.width()-2, 11, isHover ?
1666 *getPixmap(HSBSliderMidHover) : 1666 *getPixmap(HSBSliderMidHover) :
1667 *getPixmap(HSBSliderMid), 0, 1); 1667 *getPixmap(HSBSliderMid), 0, 1);
1668 } 1668 }
1669 } 1669 }
1670 painter.setPen(g.mid()); 1670 painter.setPen(g.mid());
1671 painter.drawLine(bgR.x(), bgR.y(), bgR.right(), bgR.y()); 1671 painter.drawLine(bgR.x(), bgR.y(), bgR.right(), bgR.y());
1672 painter.drawLine(bgR.x(), bgR.bottom(), bgR.right(), bgR.bottom()); 1672 painter.drawLine(bgR.x(), bgR.bottom(), bgR.right(), bgR.bottom());
1673 if(brokenApp && (controls & Slider)){ 1673 if(brokenApp && (controls & Slider)){
1674 painter.setPen(g.background()); 1674 painter.setPen(g.background());
1675 painter.drawLine(bgR.x(), bgR.bottom()-1, bgR.right(), 1675 painter.drawLine(bgR.x(), bgR.bottom()-1, bgR.right(),
1676 bgR.bottom()-1); 1676 bgR.bottom()-1);
1677 } 1677 }
1678 painter.end(); 1678 painter.end();
1679 } 1679 }
1680 1680
1681 if ( controls & AddLine ) { 1681 if ( controls & AddLine ) {
1682 drawSBButton(p, addB, g, activeControl == AddLine); 1682 drawSBButton(p, addB, g, activeControl == AddLine);
1683 drawArrow( p, horiz ? RightArrow : DownArrow, 1683 drawArrow( p, horiz ? RightArrow : DownArrow,
1684 false, addB.x()+4, addB.y()+4, 1684 false, addB.x()+4, addB.y()+4,
1685 addB.width()-8, addB.height()-8, g, !maxed); 1685 addB.width()-8, addB.height()-8, g, !maxed);
1686 } 1686 }
1687 if ( controls & SubLine ) { 1687 if ( controls & SubLine ) {
1688 // drawSBButton(p, subB, g, activeControl == SubLine); 1688 // drawSBButton(p, subB, g, activeControl == SubLine);
1689 // drawArrow( p, horiz ? LeftArrow : UpArrow, 1689 // drawArrow( p, horiz ? LeftArrow : UpArrow,
1690 // false, subB.x()+4, subB.y()+4, 1690 // false, subB.x()+4, subB.y()+4,
1691 // subB.width()-8, subB.height()-8, g, !maxed); 1691 // subB.width()-8, subB.height()-8, g, !maxed);
1692 drawSBButton(p, subHC, g, activeControl == SubLine); 1692 drawSBButton(p, subHC, g, activeControl == SubLine);
1693 drawArrow( p, horiz ? LeftArrow : UpArrow, 1693 drawArrow( p, horiz ? LeftArrow : UpArrow,
1694 false, subHC.x()+4, subHC.y()+4, 1694 false, subHC.x()+4, subHC.y()+4,
1695 subHC.width()-8, subHC.height()-8, g, !maxed); 1695 subHC.width()-8, subHC.height()-8, g, !maxed);
1696 } 1696 }
1697 1697
1698 if(controls & AddPage){ 1698 if(controls & AddPage){
1699 if(addPageR.width()){ 1699 if(addPageR.width()){
1700 p->drawPixmap(addPageR.x(), addPageR.y(), sbBuffer, 1700 p->drawPixmap(addPageR.x(), addPageR.y(), sbBuffer,
1701 addPageR.x(), addPageR.y(), addPageR.width(), 1701 addPageR.x(), addPageR.y(), addPageR.width(),
1702 addPageR.height()); 1702 addPageR.height());
1703 } 1703 }
1704 } 1704 }
1705 if(controls & SubPage){ 1705 if(controls & SubPage){
1706 if(subPageR.height()){ 1706 if(subPageR.height()){
1707 p->drawPixmap(subPageR.x(), subPageR.y(), sbBuffer, 1707 p->drawPixmap(subPageR.x(), subPageR.y(), sbBuffer,
1708 subPageR.x(), subPageR.y(), subPageR.width(), 1708 subPageR.x(), subPageR.y(), subPageR.width(),
1709 subPageR.height()); 1709 subPageR.height());
1710 } 1710 }
1711 } 1711 }
1712 if ( controls & Slider ) { 1712 if ( controls & Slider ) {
1713 p->drawPixmap(sliderR.x(), sliderR.y(), sbBuffer, 1713 p->drawPixmap(sliderR.x(), sliderR.y(), sbBuffer,
1714 sliderR.x(), sliderR.y(), sliderR.width(), 1714 sliderR.x(), sliderR.y(), sliderR.width(),
1715 sliderR.height()); 1715 sliderR.height());
1716 } 1716 }
1717} 1717}
1718 1718
1719void LiquidStyle::drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g, 1719void LiquidStyle::drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g,
1720 bool down, bool /*fast*/) 1720 bool down, bool /*fast*/)
1721{ 1721{
1722 p->setPen(g.mid()); 1722 p->setPen(g.mid());
1723 p->drawRect(r); 1723 p->drawRect(r);
1724 QColor c(down ? g.button() : g.background()); 1724 QColor c(down ? g.button() : g.background());
1725 QPixmap *pix = bevelFillDict.find(c.rgb()); 1725 QPixmap *pix = bevelFillDict.find(c.rgb());
1726 if(!pix){ 1726 if(!pix){
1727 int h, s, v; 1727 int h, s, v;
1728 c.hsv(&h, &s, &v); 1728 c.hsv(&h, &s, &v);
1729 pix = new QPixmap(*bevelFillPix); 1729 pix = new QPixmap(*bevelFillPix);
1730 adjustHSV(*pix, h, s, v); 1730 adjustHSV(*pix, h, s, v);
1731 bevelFillDict.insert(c.rgb(), pix); 1731 bevelFillDict.insert(c.rgb(), pix);
1732 } 1732 }
1733 p->drawTiledPixmap(r.x()+1, r.y()+1, r.width()-2, r.height()-2, *pix); 1733 p->drawTiledPixmap(r.x()+1, r.y()+1, r.width()-2, r.height()-2, *pix);
1734 1734
1735} 1735}
1736 1736
1737void LiquidStyle::drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g, 1737void LiquidStyle::drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g,
1738 bool horiz) 1738 bool horiz)
1739{ 1739{
1740 if(horiz){ 1740 if(horiz){
1741 if(r.width() >= 15){ 1741 if(r.width() >= 15){
1742 int y = r.y()+3; 1742 int y = r.y()+3;
1743 int x = r.x() + (r.width()-7)/2; 1743 int x = r.x() + (r.width()-7)/2;
1744 int y2 = r.bottom()-3; 1744 int y2 = r.bottom()-3;
1745 p->setPen(g.light()); 1745 p->setPen(g.light());
1746 p->drawLine(x, y, x, y2); 1746 p->drawLine(x, y, x, y2);
1747 p->drawLine(x+3, y, x+3, y2); 1747 p->drawLine(x+3, y, x+3, y2);
1748 p->drawLine(x+6, y, x+6, y2); 1748 p->drawLine(x+6, y, x+6, y2);
1749 1749
1750 p->setPen(g.mid()); 1750 p->setPen(g.mid());
1751 p->drawLine(x+1, y, x+1, y2); 1751 p->drawLine(x+1, y, x+1, y2);
1752 p->drawLine(x+4, y, x+4, y2); 1752 p->drawLine(x+4, y, x+4, y2);
1753 p->drawLine(x+7, y, x+7, y2); 1753 p->drawLine(x+7, y, x+7, y2);
1754 } 1754 }
1755 } 1755 }
1756 else{ 1756 else{
1757 if(r.height() >= 15){ 1757 if(r.height() >= 15){
1758 int x = r.x()+3; 1758 int x = r.x()+3;
1759 int y = r.y() + (r.height()-7)/2; 1759 int y = r.y() + (r.height()-7)/2;
1760 int x2 = r.right()-3; 1760 int x2 = r.right()-3;
1761 p->setPen(g.light()); 1761 p->setPen(g.light());
1762 p->drawLine(x, y, x2, y); 1762 p->drawLine(x, y, x2, y);
1763 p->drawLine(x, y+3, x2, y+3); 1763 p->drawLine(x, y+3, x2, y+3);
1764 p->drawLine(x, y+6, x2, y+6); 1764 p->drawLine(x, y+6, x2, y+6);
1765 1765
1766 p->setPen(g.mid()); 1766 p->setPen(g.mid());
1767 p->drawLine(x, y+1, x2, y+1); 1767 p->drawLine(x, y+1, x2, y+1);
1768 p->drawLine(x, y+4, x2, y+4); 1768 p->drawLine(x, y+4, x2, y+4);
1769 p->drawLine(x, y+7, x2, y+7); 1769 p->drawLine(x, y+7, x2, y+7);
1770 } 1770 }
1771 } 1771 }
1772 1772
1773} 1773}
1774 1774
1775 1775
1776void LiquidStyle::scrollBarMetrics(const QScrollBar *sb, int &sliderMin, 1776void LiquidStyle::scrollBarMetrics(const QScrollBar *sb, int &sliderMin,
1777 int &sliderMax, int &sliderLength, 1777 int &sliderMax, int &sliderLength,
1778 int &buttonDim) 1778 int &buttonDim)
1779{ 1779{
1780 1780
1781 int maxLength; 1781 int maxLength;
1782 int b = 0; 1782 int b = 0;
1783 bool horiz = sb->orientation() == QScrollBar::Horizontal; 1783 bool horiz = sb->orientation() == QScrollBar::Horizontal;
1784 int length = horiz ? sb->width() : sb->height(); 1784 int length = horiz ? sb->width() : sb->height();
1785 int extent = horiz ? sb->height() : sb->width(); 1785 int extent = horiz ? sb->height() : sb->width();
1786 1786
1787 if ( length > ( extent - b*2 - 1 )*2 + b*2 ) 1787 if ( length > ( extent - b*2 - 1 )*2 + b*2 )
1788 buttonDim = extent - b*2; 1788 buttonDim = extent - b*2;
1789 else 1789 else
1790 buttonDim = ( length - b*2 )/2 - 1; 1790 buttonDim = ( length - b*2 )/2 - 1;
1791 1791
1792 sliderMin = b + 0; // buttonDim; 1792 sliderMin = b + 0; // buttonDim;
1793 maxLength = length - b*2 - buttonDim*2; // 3; 1793 maxLength = length - b*2 - buttonDim*2; // 3;
1794 1794
1795 if ( sb->maxValue() == sb->minValue() ) { 1795 if ( sb->maxValue() == sb->minValue() ) {
1796 sliderLength = maxLength; 1796 sliderLength = maxLength;
1797 } else { 1797 } else {
1798 sliderLength = (sb->pageStep()*maxLength)/ 1798 sliderLength = (sb->pageStep()*maxLength)/
1799 (sb->maxValue()-sb->minValue()+sb->pageStep()); 1799 (sb->maxValue()-sb->minValue()+sb->pageStep());
1800 uint range = sb->maxValue()-sb->minValue(); 1800 uint range = sb->maxValue()-sb->minValue();
1801 if ( sliderLength < 9 || range > INT_MAX/2 ) 1801 if ( sliderLength < 9 || range > INT_MAX/2 )
1802 sliderLength = 9; 1802 sliderLength = 9;
1803 if ( sliderLength > maxLength ) 1803 if ( sliderLength > maxLength )
1804 sliderLength = maxLength; 1804 sliderLength = maxLength;
1805 } 1805 }
1806 sliderMax = sliderMin + maxLength - sliderLength; 1806 sliderMax = sliderMin + maxLength - sliderLength;
1807 1807
1808} 1808}
1809 1809
1810QStyle::ScrollControl LiquidStyle::scrollBarPointOver(const QScrollBar *sb, 1810QStyle::ScrollControl LiquidStyle::scrollBarPointOver(const QScrollBar *sb,
1811 int sliderStart, 1811 int sliderStart,
1812 const QPoint &p) 1812 const QPoint &p)
1813{ 1813{
1814 if ( !sb->rect().contains( p ) ) 1814 if ( !sb->rect().contains( p ) )
1815 return NoScroll; 1815 return NoScroll;
1816 int sliderMin, sliderMax, sliderLength, buttonDim, pos; 1816 int sliderMin, sliderMax, sliderLength, buttonDim, pos;
1817 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); 1817 scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
1818 pos = (sb->orientation() == QScrollBar::Horizontal)? p.x() : p.y(); 1818 pos = (sb->orientation() == QScrollBar::Horizontal)? p.x() : p.y();
1819 if ( pos < sliderMin ) 1819 if ( pos < sliderMin )
1820 return SubLine; 1820 return SubLine;
1821 if ( pos < sliderStart ) 1821 if ( pos < sliderStart )
1822 return SubPage; 1822 return SubPage;
1823 if ( pos < sliderStart + sliderLength ) 1823 if ( pos < sliderStart + sliderLength )
1824 return Slider; 1824 return Slider;
1825 if ( pos < sliderMax + sliderLength) 1825 if ( pos < sliderMax + sliderLength)
1826 return AddPage; 1826 return AddPage;
1827 if(pos > sliderMax + sliderLength + 16) 1827 if(pos > sliderMax + sliderLength + 16)
1828 return AddLine; 1828 return AddLine;
1829 1829
1830 return SubLine; 1830 return SubLine;
1831} 1831}
1832 1832
1833#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) 1833#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
1834 1834
1835 1835
1836QSize LiquidStyle::exclusiveIndicatorSize() const 1836QSize LiquidStyle::exclusiveIndicatorSize() const
1837{ 1837{
1838 return(QSize(16, 16)); 1838 return(QSize(16, 16));
1839} 1839}
1840 1840
1841void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/, 1841void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
1842 int /*h*/, const QColorGroup &/*g*/, bool on, 1842 int /*h*/, const QColorGroup &/*g*/, bool on,
1843 bool down, bool) 1843 bool down, bool)
1844{ 1844{
1845 bool isHover = highlightWidget == p->device(); 1845 bool isHover = highlightWidget == p->device();
1846 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget 1846 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
1847 && ((QWidget*)p->device())->autoMask(); 1847 && ((QWidget*)p->device())->autoMask();
1848 1848
1849 if(isMasked){ 1849 if(isMasked){
1850 if(on || down){ 1850 if(on || down){
1851 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioDownHover) : 1851 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioDownHover) :
1852 *getPixmap(HTMLRadioDown)); 1852 *getPixmap(HTMLRadioDown));
1853 } 1853 }
1854 else 1854 else
1855 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioHover) : 1855 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLRadioHover) :
1856 *getPixmap(HTMLRadio)); 1856 *getPixmap(HTMLRadio));
1857 1857
1858 } 1858 }
1859 else{ 1859 else{
1860 if(on || down){ 1860 if(on || down){
1861 p->drawPixmap(x, y, isHover ? *getPixmap(RadioOnHover) : 1861 p->drawPixmap(x, y, isHover ? *getPixmap(RadioOnHover) :
1862 *getPixmap(RadioOn)); 1862 *getPixmap(RadioOn));
1863 } 1863 }
1864 else 1864 else
1865 p->drawPixmap(x, y, isHover ? *getPixmap(RadioOffHover) : 1865 p->drawPixmap(x, y, isHover ? *getPixmap(RadioOffHover) :
1866 *getPixmap(RadioOff)); 1866 *getPixmap(RadioOff));
1867 } 1867 }
1868} 1868}
1869 1869
1870void LiquidStyle::drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w, 1870void LiquidStyle::drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w,
1871 int h, bool) 1871 int h, bool)
1872{ 1872{
1873 p->fillRect(x, y, w, h, Qt::color0); 1873 p->fillRect(x, y, w, h, Qt::color0);
1874 p->setPen(Qt::color1); 1874 p->setPen(Qt::color1);
1875 p->drawPixmap(x, y, *getPixmap(RadioOn)->mask()); 1875 p->drawPixmap(x, y, *getPixmap(RadioOn)->mask());
1876} 1876}
1877 1877
1878 1878
1879QSize LiquidStyle::indicatorSize() const 1879QSize LiquidStyle::indicatorSize() const
1880{ 1880{
1881 return(QSize(20, 22)); 1881 return(QSize(20, 22));
1882} 1882}
1883 1883
1884void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/, 1884void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1885 const QColorGroup &/*g*/, int state, bool /*down*/, bool) 1885 const QColorGroup &/*g*/, int state, bool /*down*/, bool)
1886{ 1886{
1887 bool isHover = highlightWidget == p->device(); 1887 bool isHover = highlightWidget == p->device();
1888 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget 1888 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
1889 && ((QWidget*)p->device())->autoMask(); 1889 && ((QWidget*)p->device())->autoMask();
1890 if(isMasked){ 1890 if(isMasked){
1891 if(state != QButton::Off){ 1891 if(state != QButton::Off){
1892 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBDownHover) : 1892 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBDownHover) :
1893 *getPixmap(HTMLCBDown)); 1893 *getPixmap(HTMLCBDown));
1894 } 1894 }
1895 else 1895 else
1896 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBHover) : 1896 p->drawPixmap(x, y, isHover ? *getPixmap(HTMLCBHover) :
1897 *getPixmap(HTMLCB)); 1897 *getPixmap(HTMLCB));
1898 1898
1899 } 1899 }
1900 else{ 1900 else{
1901 if(state != QButton::Off){ 1901 if(state != QButton::Off){
1902 p->drawPixmap(x, y, isHover ? *getPixmap(CBDownHover) : 1902 p->drawPixmap(x, y, isHover ? *getPixmap(CBDownHover) :
1903 *getPixmap(CBDown)); 1903 *getPixmap(CBDown));
1904 /* Todo - tristate 1904 /* Todo - tristate
1905 if(state == QButton::On){ 1905 if(state == QButton::On){
1906 p->setPen(Qt::black); 1906 p->setPen(Qt::black);
1907 p->drawPixmap(3, 3, xBmp); 1907 p->drawPixmap(3, 3, xBmp);
1908 } 1908 }
1909 else{ 1909 else{
1910 p->setPen(g.dark()); 1910 p->setPen(g.dark());
1911 p->drawRect(x+2, y+2, w-4, h-4); 1911 p->drawRect(x+2, y+2, w-4, h-4);
1912 p->setPen(Qt::black); 1912 p->setPen(Qt::black);
1913 p->drawLine(x+3, (y+h)/2-2, x+w-4, (y+h)/2-2); 1913 p->drawLine(x+3, (y+h)/2-2, x+w-4, (y+h)/2-2);
1914 p->drawLine(x+3, (y+h)/2, x+w-4, (y+h)/2); 1914 p->drawLine(x+3, (y+h)/2, x+w-4, (y+h)/2);
1915 p->drawLine(x+3, (y+h)/2+2, x+w-4, (y+h)/2+2); 1915 p->drawLine(x+3, (y+h)/2+2, x+w-4, (y+h)/2+2);
1916 }*/ 1916 }*/
1917 } 1917 }
1918 else 1918 else
1919 p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB)); 1919 p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB));
1920 } 1920 }
1921} 1921}
1922 1922
1923void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, 1923void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1924 int /*state*/) 1924 int /*state*/)
1925{ 1925{
1926 // needed for some reason by KHtml, even tho it's all filled ;P 1926 // needed for some reason by KHtml, even tho it's all filled ;P
1927 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); 1927 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
1928 1928
1929} 1929}
1930 1930
1931void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, 1931void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
1932 const QColorGroup &/*g*/, Orientation orient, 1932 const QColorGroup &/*g*/, Orientation orient,
1933 bool, bool) 1933 bool, bool)
1934{ 1934{
1935 QWidget *parent = (QWidget *)p->device(); 1935 QWidget *parent = (QWidget *)p->device();
1936 p->setBrushOrigin(parent->pos()); 1936 p->setBrushOrigin(parent->pos());
1937 parent->erase(x, y, w, h); 1937 parent->erase(x, y, w, h);
1938 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : 1938 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
1939 *getPixmap(VSlider)); 1939 *getPixmap(VSlider));
1940} 1940}
1941 1941
1942void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, 1942void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
1943 Orientation orient, bool, bool) 1943 Orientation orient, bool, bool)
1944{ 1944{
1945 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : 1945 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
1946 *getPixmap(VSlider)->mask()); 1946 *getPixmap(VSlider)->mask());
1947} 1947}
1948 1948
1949int LiquidStyle::sliderLength() const 1949int LiquidStyle::sliderLength() const
1950{ 1950{
1951 return(10); 1951 return(10);
1952} 1952}
1953 1953
1954#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) 1954#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
1955 1955
1956void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x, 1956void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x,
1957 int y, int w, int h, const QColorGroup &g, 1957 int y, int w, int h, const QColorGroup &g,
1958 bool enabled, const QBrush *) 1958 bool enabled, const QBrush *)
1959{ 1959{
1960 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}; 1960 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};
1961 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}; 1961 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};
1962 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}; 1962 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};
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
1992void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 1992void 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 }
2036 else{ 2036 else{
2037 if(active) 2037 if(active)
2038 drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background()); 2038 drawClearBevel(p, x+1, y+1, w-1, h-1, g.button(), g.background());
2039 QApplication::style().drawItem(p, x, y, w, h, 2039 QApplication::style().drawItem(p, x, y, w, h,
2040 AlignCenter|ShowPrefix|DontClip|SingleLine, 2040 AlignCenter|ShowPrefix|DontClip|SingleLine,
2041 g, mi->isEnabled(), NULL, mi->text(), 2041 g, mi->isEnabled(), NULL, mi->text(),
2042 -1, &g.text()); 2042 -1, &g.text());
2043 } 2043 }
2044} 2044}
2045 2045
2046void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, 2046void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
2047 const QColorGroup &g, int /*lineWidth*/, 2047 const QColorGroup &g, int /*lineWidth*/,
2048 const QBrush * /*fill*/) 2048 const QBrush * /*fill*/)
2049{ 2049{
2050 QColor c; 2050 QColor c;
2051 switch(menuHandler->transType()){ 2051 switch(menuHandler->transType()){
2052 case None: 2052 case None:
2053 case StippledBg: 2053 case StippledBg:
2054 case TransStippleBg: 2054 case TransStippleBg:
2055 c = g.background(); 2055 c = g.background();
2056 break; 2056 break;
2057 case StippledBtn: 2057 case StippledBtn:
2058 case TransStippleBtn: 2058 case TransStippleBtn:
2059 c = g.button(); 2059 c = g.button();
2060 break; 2060 break;
2061 default: 2061 default:
2062 c = menuHandler->bgColor(); 2062 c = menuHandler->bgColor();
2063 } 2063 }
2064 p->setPen(c.dark(140)); 2064 p->setPen(c.dark(140));
2065 p->drawRect(x, y, w, h); 2065 p->drawRect(x, y, w, h);
2066 p->setPen(c.light(120)); 2066 p->setPen(c.light(120));
2067 p->drawRect(x+1, y+1, w-2, h-2); 2067 p->drawRect(x+1, y+1, w-2, h-2);
2068} 2068}
2069 2069
2070void LiquidStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, 2070void LiquidStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
2071 int tab, QMenuItem* mi, 2071 int tab, QMenuItem* mi,
2072 const QPalette& pal, bool act, 2072 const QPalette& pal, bool act,
2073 bool enabled, int x, int y, int w, int h) 2073 bool enabled, int x, int y, int w, int h)
2074{ 2074{
2075static const int motifItemFrame = 2; 2075static const int motifItemFrame = 2;
2076static const int motifItemHMargin = 3; 2076static const int motifItemHMargin = 3;
2077static const int motifItemVMargin = 2; 2077static const int motifItemVMargin = 2;
2078static const int motifArrowHMargin = 6; 2078static const int motifArrowHMargin = 6;
2079static const int windowsRightBorder = 12; 2079static const int windowsRightBorder = 12;
2080 2080
2081 maxpmw = QMAX( maxpmw, 20 ); 2081 maxpmw = QMAX( maxpmw, 20 );
2082 2082
2083 2083
2084 bool dis = !enabled; 2084 bool dis = !enabled;
2085 QColorGroup itemg = dis ? pal.disabled() : pal.active(); 2085 QColorGroup itemg = dis ? pal.disabled() : pal.active();
2086 2086
2087 int checkcol = maxpmw; 2087 int checkcol = maxpmw;
2088 if(act){ 2088 if(act){
2089 2089
2090 // FIXME 2090 // FIXME
2091 drawClearBevel(p, x, y, w, h, itemg.button(), itemg.background()); 2091 drawClearBevel(p, x, y, w, h, itemg.button(), itemg.background());
2092 } 2092 }
2093 //else if(((QWidget*)p->device())->backgroundPixmap()){ 2093 //else if(((QWidget*)p->device())->backgroundPixmap()){
2094 // p->drawPixmap(x, y, *((QWidget*)p->device())->backgroundPixmap(), 2094 // p->drawPixmap(x, y, *((QWidget*)p->device())->backgroundPixmap(),
2095 // x, y, w, h); 2095 // x, y, w, h);
2096 //} 2096 //}
2097 else{ 2097 else{
2098 if(menuHandler->transType() == None){ 2098 if(menuHandler->transType() == None){
2099 p->fillRect(x, y, w, h, pal.active().background()); 2099 p->fillRect(x, y, w, h, pal.active().background());
2100 } 2100 }
2101 else if(menuHandler->transType() == StippledBg){ 2101 else if(menuHandler->transType() == StippledBg){
2102 p->fillRect(x, y, w, h, bgBrush); 2102 p->fillRect(x, y, w, h, bgBrush);
2103 } 2103 }
2104 else if(menuHandler->transType() == StippledBtn){ 2104 else if(menuHandler->transType() == StippledBtn){
2105 p->fillRect(x, y, w, h, menuBrush); 2105 p->fillRect(x, y, w, h, menuBrush);
2106 } 2106 }
2107 else{ 2107 else{
2108 QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId()); 2108 QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId());
2109 if(pix) 2109 if(pix)
2110 p->drawPixmap(x, y, *pix, x, y, w, h); 2110 p->drawPixmap(x, y, *pix, x, y, w, h);
2111 } 2111 }
2112 } 2112 }
2113 2113
2114 if(!mi) 2114 if(!mi)
2115 return; 2115 return;
2116 2116
2117 QColor discol; 2117 QColor discol;
2118 if (dis) { 2118 if (dis) {
2119 discol = itemg.mid(); 2119 discol = itemg.mid();
2120 p->setPen(discol); 2120 p->setPen(discol);
2121 } 2121 }
2122 2122
2123 QColorGroup cg2(itemg); 2123 QColorGroup cg2(itemg);
2124 2124
2125 if(menuHandler->transType() == Custom){ 2125 if(menuHandler->transType() == Custom){
2126 cg2.setColor(QColorGroup::Foreground, menuHandler->textColor()); 2126 cg2.setColor(QColorGroup::Foreground, menuHandler->textColor());
2127 cg2.setColor(QColorGroup::Text, menuHandler->textColor()); 2127 cg2.setColor(QColorGroup::Text, menuHandler->textColor());
2128 cg2.setColor(QColorGroup::Light, menuHandler->textColor().light(120)); 2128 cg2.setColor(QColorGroup::Light, menuHandler->textColor().light(120));
2129 cg2.setColor(QColorGroup::Mid, menuHandler->textColor().dark(120)); 2129 cg2.setColor(QColorGroup::Mid, menuHandler->textColor().dark(120));
2130 } 2130 }
2131 else{ 2131 else{
2132 cg2 = QColorGroup(discol, itemg.highlight(), black, black, 2132 cg2 = QColorGroup(discol, itemg.highlight(), black, black,
2133 dis ? discol : black, discol, black); 2133 dis ? discol : black, discol, black);
2134 } 2134 }
2135 2135
2136 if(mi->isSeparator()){ 2136 if(mi->isSeparator()){
2137 QColor c; 2137 QColor c;
2138 switch(menuHandler->transType()){ 2138 switch(menuHandler->transType()){
2139 case None: 2139 case None:
2140 case StippledBg: 2140 case StippledBg:
2141 case TransStippleBg: 2141 case TransStippleBg:
2142 c = QApplication::palette().active().background(); 2142 c = QApplication::palette().active().background();
2143 break; 2143 break;
2144 case StippledBtn: 2144 case StippledBtn:
2145 case TransStippleBtn: 2145 case TransStippleBtn:
2146 c = QApplication::palette().active().button(); 2146 c = QApplication::palette().active().button();
2147 break; 2147 break;
2148 default: 2148 default:
2149 c = menuHandler->bgColor(); 2149 c = menuHandler->bgColor();
2150 } 2150 }
2151 p->setPen(c.dark(140)); 2151 p->setPen(c.dark(140));
2152 p->drawLine(x, y, x+w, y ); 2152 p->drawLine(x, y, x+w, y );
2153 p->setPen(c.light(115)); 2153 p->setPen(c.light(115));
2154 p->drawLine(x, y+1, x+w, y+1 ); 2154 p->drawLine(x, y+1, x+w, y+1 );
2155 return; 2155 return;
2156 } 2156 }
2157 if(mi->iconSet()) { 2157 if(mi->iconSet()) {
2158 QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal; 2158 QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal;
2159 if (!dis) 2159 if (!dis)
2160 mode = QIconSet::Active; 2160 mode = QIconSet::Active;
2161 QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode); 2161 QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode);
2162 int pixw = pixmap.width(); 2162 int pixw = pixmap.width();
2163 int pixh = pixmap.height(); 2163 int pixh = pixmap.height();
2164 QRect cr(x, y, checkcol, h); 2164 QRect cr(x, y, checkcol, h);
2165 QRect pmr(0, 0, pixw, pixh); 2165 QRect pmr(0, 0, pixw, pixh);
2166 pmr.moveCenter( cr.center() ); 2166 pmr.moveCenter( cr.center() );
2167 p->setPen(itemg.highlightedText()); 2167 p->setPen(itemg.highlightedText());
2168 p->drawPixmap(pmr.topLeft(), pixmap ); 2168 p->drawPixmap(pmr.topLeft(), pixmap );
2169 2169
2170 } 2170 }
2171 else if(checkable) { 2171 else if(checkable) {
2172 int mw = checkcol + motifItemFrame; 2172 int mw = checkcol + motifItemFrame;
2173 int mh = h - 2*motifItemFrame; 2173 int mh = h - 2*motifItemFrame;
2174 if (mi->isChecked()){ 2174 if (mi->isChecked()){
2175 drawCheckMark( p, x + motifItemFrame, 2175 drawCheckMark( p, x + motifItemFrame,
2176 y+motifItemFrame, mw, mh, cg2, act, dis ); 2176 y+motifItemFrame, mw, mh, cg2, act, dis );
2177 } 2177 }
2178 } 2178 }
2179 if(menuHandler->transType() == Custom) 2179 if(menuHandler->transType() == Custom)
2180 p->setPen(menuHandler->textColor()); 2180 p->setPen(menuHandler->textColor());
2181 else 2181 else
2182 p->setPen(itemg.text()); 2182 p->setPen(itemg.text());
2183 2183
2184 2184
2185 int xm = motifItemFrame + checkcol + motifItemHMargin; 2185 int xm = motifItemFrame + checkcol + motifItemHMargin;
2186 QString s = mi->text(); 2186 QString s = mi->text();
2187 if (!s.isNull()) { 2187 if (!s.isNull()) {
2188 int t = s.find( '\t' ); 2188 int t = s.find( '\t' );
2189 int m = motifItemVMargin; 2189 int m = motifItemVMargin;
2190 const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine; 2190 const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
2191 QPen oldPen = p->pen(); 2191 QPen oldPen = p->pen();
2192 if(menuHandler->useShadowText()){ 2192 if(menuHandler->useShadowText()){
2193 if(menuHandler->transType() == Custom) 2193 if(menuHandler->transType() == Custom)
2194 p->setPen(menuHandler->bgColor().dark(130)); 2194 p->setPen(menuHandler->bgColor().dark(130));
2195 else if(menuHandler->transType() == StippledBtn || 2195 else if(menuHandler->transType() == StippledBtn ||
2196 menuHandler->transType() == TransStippleBtn) 2196 menuHandler->transType() == TransStippleBtn)
2197 p->setPen(itemg.button().dark(130)); 2197 p->setPen(itemg.button().dark(130));
2198 else 2198 else
2199 p->setPen(bgBrush.color().dark(130)); 2199 p->setPen(bgBrush.color().dark(130));
2200 2200
2201 if (t >= 0) { 2201 if (t >= 0) {
2202 p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+2, 2202 p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+2,
2203 y+m+2, tab-1, h-2*m-1, text_flags, s.mid( t+1 )); 2203 y+m+2, tab-1, h-2*m-1, text_flags, s.mid( t+1 ));
2204 } 2204 }
2205 p->drawText(x+xm+1, y+m+1, w-xm-tab, h-2*m-1, text_flags, s, t); 2205 p->drawText(x+xm+1, y+m+1, w-xm-tab, h-2*m-1, text_flags, s, t);
2206 } 2206 }
2207 p->setPen(oldPen); 2207 p->setPen(oldPen);
2208 if (t >= 0) { 2208 if (t >= 0) {
2209 p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1, 2209 p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
2210 y+m+1, tab, h-2*m, text_flags, s.mid( t+1 )); 2210 y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
2211 } 2211 }
2212 p->drawText(x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t); 2212 p->drawText(x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t);
2213 2213
2214 } 2214 }
2215 else if (mi->pixmap()) { 2215 else if (mi->pixmap()) {
2216 QPixmap *pixmap = mi->pixmap(); 2216 QPixmap *pixmap = mi->pixmap();
2217 if (pixmap->depth() == 1) 2217 if (pixmap->depth() == 1)
2218 p->setBackgroundMode(OpaqueMode); 2218 p->setBackgroundMode(OpaqueMode);
2219 p->drawPixmap( x+xm, y+motifItemFrame, *pixmap); 2219 p->drawPixmap( x+xm, y+motifItemFrame, *pixmap);
2220 if (pixmap->depth() == 1) 2220 if (pixmap->depth() == 1)
2221 p->setBackgroundMode(TransparentMode); 2221 p->setBackgroundMode(TransparentMode);
2222 } 2222 }
2223 if (mi->popup()) { 2223 if (mi->popup()) {
2224 int dim = (h-2*motifItemFrame) / 2; 2224 int dim = (h-2*motifItemFrame) / 2;
2225 drawArrow(p, RightArrow, true, 2225 drawArrow(p, RightArrow, true,
2226 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, 2226 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
2227 dim, dim, cg2, TRUE); 2227 dim, dim, cg2, TRUE);
2228 } 2228 }
2229} 2229}
2230 2230
2231int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi, 2231int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
2232 const QFontMetrics &fm) 2232 const QFontMetrics &fm)
2233{ 2233{
2234 if (mi->isSeparator()) 2234 if (mi->isSeparator())
2235 return 2; 2235 return 2;
2236 2236
2237 int h = 0; 2237 int h = 0;
2238 if (mi->pixmap()) 2238 if (mi->pixmap())
2239 h = mi->pixmap()->height(); 2239 h = mi->pixmap()->height();
2240 2240
2241 if (mi->iconSet()) 2241 if (mi->iconSet())
2242 h = QMAX(mi->iconSet()-> 2242 h = QMAX(mi->iconSet()->
2243 pixmap(QIconSet::Small, QIconSet::Normal).height(), h); 2243 pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
2244 2244
2245 h = QMAX(fm.height() + 4, h); 2245 h = QMAX(fm.height() + 4, h);
2246 2246
2247 // we want a minimum size of 18 2247 // we want a minimum size of 18
2248 h = QMAX(h, 18); 2248 h = QMAX(h, 18);
2249 2249
2250 return h; 2250 return h;
2251} 2251}
2252 2252
2253 2253
2254void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, 2254void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
2255 const QColorGroup &g, const QColor *c, 2255 const QColorGroup &g, const QColor *c,
2256 bool atBorder) 2256 bool atBorder)
2257{ 2257{
2258 // are we painting a widget? 2258 // are we painting a widget?
2259 if(p->device()->devType() == QInternal::Widget){ 2259 if(p->device()->devType() == QInternal::Widget){
2260 // if so does it use a special focus rectangle? 2260 // if so does it use a special focus rectangle?
2261 QWidget *w = (QWidget *)p->device(); 2261 QWidget *w = (QWidget *)p->device();
2262 if(w->inherits("QPushButton") || w->inherits("QSlider")){ 2262 if(w->inherits("QPushButton") || w->inherits("QSlider")){
2263 return; 2263 return;
2264 } 2264 }
2265 else{ 2265 else{
2266 QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); 2266 QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
2267 } 2267 }
2268 } 2268 }
2269 else 2269 else
2270 QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); 2270 QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
2271 2271
2272} 2272}
2273 2273
2274void LiquidStyle::polishPopupMenu(QPopupMenu *mnu) 2274void LiquidStyle::polishPopupMenu(QPopupMenu *mnu)
2275{ 2275{
2276 mnu->installEventFilter(menuHandler); 2276 mnu->installEventFilter(menuHandler);
2277 QWindowsStyle::polishPopupMenu(mnu); 2277 QWindowsStyle::polishPopupMenu(mnu);
2278} 2278}
2279 2279
2280void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, 2280void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab,
2281 bool selected) 2281 bool selected)
2282{ 2282{
2283 if(tabBar->shape() != QTabBar::RoundedAbove){ 2283 if(tabBar->shape() != QTabBar::RoundedAbove){
2284 QWindowsStyle::drawTab(p, tabBar, tab, selected); 2284 QWindowsStyle::drawTab(p, tabBar, tab, selected);
2285 return; 2285 return;
2286 } 2286 }
2287 QPixmap tilePix; 2287 QPixmap tilePix;
2288 QRect r = tab->rect(); 2288 QRect r = tab->rect();
2289 //QPixmap *pix = selected ? tabBar->hasFocus() ? pixmaps[TabFocus] : 2289 //QPixmap *pix = selected ? tabBar->hasFocus() ? pixmaps[TabFocus] :
2290 // pixmaps[TabDown] : pixmaps[Tab]; 2290 // pixmaps[TabDown] : pixmaps[Tab];
2291 2291
2292 QPixmap *pix = selected ? getPixmap(TabDown) : getPixmap(Tab); 2292 QPixmap *pix = selected ? getPixmap(TabDown) : getPixmap(Tab);
2293 p->drawPixmap(r.x(), r.y(), *pix, 0, 0, 9, r.height()); 2293 p->drawPixmap(r.x(), r.y(), *pix, 0, 0, 9, r.height());
2294 p->drawPixmap(r.right()-9, r.y(), *pix, pix->width()-9, 0, 9, r.height()); 2294 p->drawPixmap(r.right()-9, r.y(), *pix, pix->width()-9, 0, 9, r.height());
2295 tilePix.resize(pix->width()-18, r.height()); 2295 tilePix.resize(pix->width()-18, r.height());
2296 bitBlt(&tilePix, 0, 0, pix, 9, 0, pix->width()-18, r.height()); 2296 bitBlt(&tilePix, 0, 0, pix, 9, 0, pix->width()-18, r.height());
2297 p->drawTiledPixmap(r.x()+9, r.y(), r.width()-18, r.height(), tilePix); 2297 p->drawTiledPixmap(r.x()+9, r.y(), r.width()-18, r.height(), tilePix);
2298 QColor c = tabBar->colorGroup().button(); 2298 QColor c = tabBar->colorGroup().button();
2299 if(!selected){ 2299 if(!selected){
2300 p->setPen(c.dark(130)); 2300 p->setPen(c.dark(130));
2301 p->drawLine(r.x(), r.bottom(), r.right(), r.bottom()); 2301 p->drawLine(r.x(), r.bottom(), r.right(), r.bottom());
2302 } 2302 }
2303 2303
2304 /* 2304 /*
2305 p->setPen(c.light(110)); 2305 p->setPen(c.light(110));
2306 p->drawLine(r.x(), r.bottom()+1, r.right(), r.bottom()+1); 2306 p->drawLine(r.x(), r.bottom()+1, r.right(), r.bottom()+1);
2307 p->setPen(c); 2307 p->setPen(c);
2308 p->drawLine(r.x(), r.bottom()+2, r.right(), r.bottom()+2); 2308 p->drawLine(r.x(), r.bottom()+2, r.right(), r.bottom()+2);
2309 p->setPen(c.light(110)); 2309 p->setPen(c.light(110));
2310 p->drawLine(r.x(), r.bottom()+3, r.right(), r.bottom()+3); 2310 p->drawLine(r.x(), r.bottom()+3, r.right(), r.bottom()+3);
2311 p->setPen(c.light(120)); 2311 p->setPen(c.light(120));
2312 p->drawLine(r.x(), r.bottom()+4, r.right(), r.bottom()+4); 2312 p->drawLine(r.x(), r.bottom()+4, r.right(), r.bottom()+4);
2313 */ 2313 */
2314 2314
2315 /* 2315 /*
2316 QColor c = tabBar->colorGroup().button(); 2316 QColor c = tabBar->colorGroup().button();
2317 pix = bevelFillDict.find(c.rgb()); 2317 pix = bevelFillDict.find(c.rgb());
2318 if(!pix){ 2318 if(!pix){
2319 int h, s, v; 2319 int h, s, v;
2320 c.hsv(&h, &s, &v); 2320 c.hsv(&h, &s, &v);
2321 pix = new QPixmap(*bevelFillPix); 2321 pix = new QPixmap(*bevelFillPix);
2322 adjustHSV(*pix, h, s); 2322 adjustHSV(*pix, h, s);
2323 bevelFillDict.insert(c.rgb(), pix); 2323 bevelFillDict.insert(c.rgb(), pix);
2324 }*/ 2324 }*/
2325 2325
2326 /* 2326 /*
2327 QRect r = tab->rect(); 2327 QRect r = tab->rect();
2328 QColorGroup g = tabBar->colorGroup(); 2328 QColorGroup g = tabBar->colorGroup();
2329 if(!selected){ 2329 if(!selected){
2330 r.setY(r.y()+1); 2330 r.setY(r.y()+1);
2331 p->setPen(g.dark()); 2331 p->setPen(g.dark());
2332 p->drawLine(r.x(), r.y()+4, r.x(), r.bottom()-2); 2332 p->drawLine(r.x(), r.y()+4, r.x(), r.bottom()-2);
2333 p->drawLine(r.x(), r.y()+4, r.x()+4, r.y()); 2333 p->drawLine(r.x(), r.y()+4, r.x()+4, r.y());
2334 p->drawLine(r.x()+4, r.y(), r.right()-1, r.y()); 2334 p->drawLine(r.x()+4, r.y(), r.right()-1, r.y());
2335 p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()-2); 2335 p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()-2);
2336 2336
2337 p->setPen(g.midlight()); 2337 p->setPen(g.midlight());
2338 p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom()); 2338 p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom());
2339 p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1); 2339 p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1);
2340 p->drawLine(r.x()+5, r.y()+1, r.right()-2, r.y()+1); 2340 p->drawLine(r.x()+5, r.y()+1, r.right()-2, r.y()+1);
2341 p->drawLine(r.x(), r.bottom(), r.right(), r.bottom()); 2341 p->drawLine(r.x(), r.bottom(), r.right(), r.bottom());
2342 2342
2343 p->setPen(g.mid()); 2343 p->setPen(g.mid());
2344 p->drawPoint(r.right()-1, r.y()+1); 2344 p->drawPoint(r.right()-1, r.y()+1);
2345 p->drawLine(r.x()+4, r.y()+2, r.right()-1, r.y()+2); 2345 p->drawLine(r.x()+4, r.y()+2, r.right()-1, r.y()+2);
2346 p->drawLine(r.x()+3, r.y()+3, r.right()-1, r.y()+3); 2346 p->drawLine(r.x()+3, r.y()+3, r.right()-1, r.y()+3);
2347 2347
2348 p->fillRect(r.x()+2, r.y()+4, r.width()-3, r.height()-6, 2348 p->fillRect(r.x()+2, r.y()+4, r.width()-3, r.height()-6,
2349 g.brush(QColorGroup::Mid)); 2349 g.brush(QColorGroup::Mid));
2350 2350
2351 p->setPen(g.light()); 2351 p->setPen(g.light());
2352 p->drawLine(r.x(), r.bottom()-1, r.right(), r.bottom()-1); 2352 p->drawLine(r.x(), r.bottom()-1, r.right(), r.bottom()-1);
2353 2353
2354 } 2354 }
2355 else{ 2355 else{
2356 p->setPen(g.light()); 2356 p->setPen(g.light());
2357 p->drawLine(r.x(), r.y()+4, r.x(), r.bottom()); 2357 p->drawLine(r.x(), r.y()+4, r.x(), r.bottom());
2358 p->drawLine(r.x(), r.y()+4, r.x()+4, r.y()); 2358 p->drawLine(r.x(), r.y()+4, r.x()+4, r.y());
2359 p->drawLine(r.x()+4, r.y(), r.right()-1, r.y()); 2359 p->drawLine(r.x()+4, r.y(), r.right()-1, r.y());
2360 p->setPen(g.dark()); 2360 p->setPen(g.dark());
2361 p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()); 2361 p->drawLine(r.right(), r.y()+1, r.right(), r.bottom());
2362 2362
2363 p->setPen(g.midlight()); 2363 p->setPen(g.midlight());
2364 p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom()); 2364 p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom());
2365 p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1); 2365 p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1);
2366 p->drawLine(r.x()+5, r.y()+1, r.right() - 2, r.y()+1); 2366 p->drawLine(r.x()+5, r.y()+1, r.right() - 2, r.y()+1);
2367 p->setPen(g.mid()); 2367 p->setPen(g.mid());
2368 p->drawLine(r.right()-1, r.y()+1, r.right()-1, r.bottom()); 2368 p->drawLine(r.right()-1, r.y()+1, r.right()-1, r.bottom());
2369 }*/ 2369 }*/
2370 2370
2371} 2371}
2372 2372
2373 2373
2374 2374
2375void LiquidStyle::drawTabMask(QPainter *p, const QTabBar*, QTab *tab, 2375void LiquidStyle::drawTabMask(QPainter *p, const QTabBar*, QTab *tab,
2376 bool selected) 2376 bool selected)
2377 2377
2378 2378
2379{ 2379{
2380 //p->fillRect(tab->rect(), Qt::color1); 2380 //p->fillRect(tab->rect(), Qt::color1);
2381 QRect r = tab->rect(); 2381 QRect r = tab->rect();
2382 QPixmap *pix = selected ? getPixmap(TabDown) : getPixmap(Tab); 2382 QPixmap *pix = selected ? getPixmap(TabDown) : getPixmap(Tab);
2383 p->drawPixmap(r.x(), r.y(), *pix->mask(), 0, 0, 9, r.height()); 2383 p->drawPixmap(r.x(), r.y(), *pix->mask(), 0, 0, 9, r.height());
2384 p->drawPixmap(r.right()-9, r.y(), *pix->mask(), pix->width()-9, 0, 9, r.height()); 2384 p->drawPixmap(r.right()-9, r.y(), *pix->mask(), pix->width()-9, 0, 9, r.height());
2385 p->fillRect(r.x()+9, r.y(), r.width()-18, r.height(), Qt::color1); 2385 p->fillRect(r.x()+9, r.y(), r.width()-18, r.height(), Qt::color1);
2386} 2386}
2387 2387
2388void LiquidStyle::tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame, 2388void LiquidStyle::tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame,
2389 int &overlap) 2389 int &overlap)
2390{ 2390{
2391 if(t->shape() == QTabBar::RoundedAbove){ 2391 if(t->shape() == QTabBar::RoundedAbove){
2392 overlap = 1; 2392 overlap = 1;
2393 hFrame = 18; // was 24 2393 hFrame = 18; // was 24
2394 vFrame = 8; // was 10 2394 vFrame = 8; // was 10
2395 } 2395 }
2396 else 2396 else
2397 QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap); 2397 QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
2398} 2398}
2399 2399
2400 2400
2401 2401
2402void LiquidStyle::drawSplitter(QPainter *p, int x, int y, int w, int h, 2402void LiquidStyle::drawSplitter(QPainter *p, int x, int y, int w, int h,
2403 const QColorGroup &g, Orientation) 2403 const QColorGroup &g, Orientation)
2404{ 2404{
2405 drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ? 2405 drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ?
2406 g.button().light(120) : g.button(), g.background()); 2406 g.button().light(120) : g.button(), g.background());
2407} 2407}
2408 2408
2409 2409
2410void LiquidStyle::drawPanel(QPainter *p, int x, int y, int w, int h, 2410void LiquidStyle::drawPanel(QPainter *p, int x, int y, int w, int h,
2411 const QColorGroup &g, bool sunken, 2411 const QColorGroup &g, bool sunken,
2412 int lineWidth, const QBrush *fill) 2412 int lineWidth, const QBrush *fill)
2413{ 2413{
2414 if(p->device()->devType() == QInternal::Widget && 2414 if(p->device()->devType() == QInternal::Widget &&
2415 ((QWidget *)p->device())->inherits("QLineEdit")){ 2415 ((QWidget *)p->device())->inherits("QLineEdit")){
2416 int x2 = x+w-1; 2416 int x2 = x+w-1;
2417 int y2 = y+h-1; 2417 int y2 = y+h-1;
2418 p->setPen(g.dark()); 2418 p->setPen(g.dark());
2419 p->drawRect(x, y, w, h); 2419 p->drawRect(x, y, w, h);
2420 p->setPen(g.mid()); 2420 p->setPen(g.mid());
2421 p->drawLine(x+1, y+1, x2-2, y+1); 2421 p->drawLine(x+1, y+1, x2-2, y+1);
2422 p->drawLine(x+1, y+1, x+1, y2-1); 2422 p->drawLine(x+1, y+1, x+1, y2-1);
2423 } 2423 }
2424 else if(lineWidth != 2 || !sunken) 2424 else if(lineWidth != 2 || !sunken)
2425 QWindowsStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); 2425 QWindowsStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill);
2426 else{ 2426 else{
2427 QPen oldPen = p->pen(); 2427 QPen oldPen = p->pen();
2428 int x2 = x+w-1; 2428 int x2 = x+w-1;
2429 int y2 = y+h-1; 2429 int y2 = y+h-1;
2430 p->setPen(g.light()); 2430 p->setPen(g.light());
2431 p->drawLine(x, y2, x2, y2); 2431 p->drawLine(x, y2, x2, y2);
2432 p->drawLine(x2, y, x2, y2); 2432 p->drawLine(x2, y, x2, y2);
2433 p->setPen(g.mid()); 2433 p->setPen(g.mid());
2434 p->drawLine(x, y, x2, y); 2434 p->drawLine(x, y, x2, y);
2435 p->drawLine(x, y, x, y2); 2435 p->drawLine(x, y, x, y2);
2436 2436
2437 p->setPen(g.midlight()); 2437 p->setPen(g.midlight());
2438 p->drawLine(x+1, y2-1, x2-1, y2-1); 2438 p->drawLine(x+1, y2-1, x2-1, y2-1);
2439 p->drawLine(x2-1, y+1, x2-1, y2-1); 2439 p->drawLine(x2-1, y+1, x2-1, y2-1);
2440 p->setPen(g.dark()); 2440 p->setPen(g.dark());
2441 p->drawLine(x+1, y+1, x2-1, y+1); 2441 p->drawLine(x+1, y+1, x2-1, y+1);
2442 p->drawLine(x+1, y+1, x+1, y2-1); 2442 p->drawLine(x+1, y+1, x+1, y2-1);
2443 p->setPen(oldPen); 2443 p->setPen(oldPen);
2444 if(fill){ 2444 if(fill){
2445 // I believe here we are only supposed to fill if there is a 2445 // I believe here we are only supposed to fill if there is a
2446 // specified fill brush... 2446 // specified fill brush...
2447 p->fillRect(x+2, y+2, w-4, h-4, *fill); 2447 p->fillRect(x+2, y+2, w-4, h-4, *fill);
2448 } 2448 }
2449 } 2449 }
2450} 2450}
2451 2451
2452 2452
2453void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) 2453void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
2454{ 2454{
2455 QBitmap *maskBmp = NULL; 2455 QBitmap *maskBmp = NULL;
2456 if(pix.mask()) 2456 if(pix.mask())
2457 maskBmp = new QBitmap(*pix.mask()); 2457 maskBmp = new QBitmap(*pix.mask());
2458 QImage img = pix.convertToImage(); 2458 QImage img = pix.convertToImage();
2459 if(img.depth() != 32) 2459 if(img.depth() != 32)
2460 img = img.convertDepth(32); 2460 img = img.convertDepth(32);
2461 unsigned int *data = (unsigned int *)img.bits(); 2461 unsigned int *data = (unsigned int *)img.bits();
2462 int total = img.width()*img.height(); 2462 int total = img.width()*img.height();
2463 int current; 2463 int current;
2464 QColor c; 2464 QColor c;
2465 int oldH, oldS, oldV; 2465 int oldH, oldS, oldV;
2466 if(v < 235) 2466 if(v < 235)
2467 v += 20; 2467 v += 20;
2468 else 2468 else
2469 v = 255; 2469 v = 255;
2470 float intensity = v/255.0; 2470 float intensity = v/255.0;
2471 2471
2472 for(current=0; current<total; ++current){ 2472 for(current=0; current<total; ++current){
2473 c.setRgb(data[current]); 2473 c.setRgb(data[current]);
2474 c.hsv(&oldH, &oldS, &oldV); 2474 c.hsv(&oldH, &oldS, &oldV);
2475 oldV = (int)(oldV*intensity); 2475 oldV = (int)(oldV*intensity);
2476 c.setHsv(h, s, oldV); 2476 c.setHsv(h, s, oldV);
2477 data[current] = c.rgb(); 2477 data[current] = c.rgb();
2478 } 2478 }
2479 pix.convertFromImage(img); 2479 pix.convertFromImage(img);
2480 if(maskBmp) 2480 if(maskBmp)
2481 pix.setMask(*maskBmp); 2481 pix.setMask(*maskBmp);
2482} 2482}
2483 2483
2484void LiquidStyle::intensity(QPixmap &pix, float percent) 2484void LiquidStyle::intensity(QPixmap &pix, float percent)
2485{ 2485{
2486 QImage image = pix.convertToImage(); 2486 QImage image = pix.convertToImage();
2487 int i, tmp, r, g, b; 2487 int i, tmp, r, g, b;
2488 int segColors = image.depth() > 8 ? 256 : image.numColors(); 2488 int segColors = image.depth() > 8 ? 256 : image.numColors();
2489 unsigned char *segTbl = new unsigned char[segColors]; 2489 unsigned char *segTbl = new unsigned char[segColors];
2490 int pixels = image.depth() > 8 ? image.width()*image.height() : 2490 int pixels = image.depth() > 8 ? image.width()*image.height() :
2491 image.numColors(); 2491 image.numColors();
2492 unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() : 2492 unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() :
2493 (unsigned int *)image.colorTable(); 2493 (unsigned int *)image.colorTable();
2494 2494
2495 bool brighten = (percent >= 0); 2495 bool brighten = (percent >= 0);
2496 if(percent < 0) 2496 if(percent < 0)
2497 percent = -percent; 2497 percent = -percent;
2498 2498
2499 if(brighten){ // keep overflow check out of loops 2499 if(brighten){ // keep overflow check out of loops
2500 for(i=0; i < segColors; ++i){ 2500 for(i=0; i < segColors; ++i){
2501 tmp = (int)(i*percent); 2501 tmp = (int)(i*percent);
2502 if(tmp > 255) 2502 if(tmp > 255)
2503 tmp = 255; 2503 tmp = 255;
2504 segTbl[i] = tmp; 2504 segTbl[i] = tmp;
2505 } 2505 }
2506 } 2506 }
2507 else{ 2507 else{
2508 for(i=0; i < segColors; ++i){ 2508 for(i=0; i < segColors; ++i){
2509 tmp = (int)(i*percent); 2509 tmp = (int)(i*percent);
2510 if(tmp < 0) 2510 if(tmp < 0)
2511 tmp = 0; 2511 tmp = 0;
2512 segTbl[i] = tmp; 2512 segTbl[i] = tmp;
2513 } 2513 }
2514 } 2514 }
2515 2515