summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp14
-rw-r--r--noncore/styles/liquid/plugin.cpp2
2 files changed, 3 insertions, 13 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 4653639..2b6eaa4 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1,427 +1,418 @@
/*-
* Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
*/
#ifndef INCLUDE_MENUITEM_DEF
#define INCLUDE_MENUITEM_DEF
#endif
#include <qmenudata.h>
#include "liquid.h"
#include <qapplication.h>
#include <qpe/config.h>
#include "effects.h"
#include <qpalette.h>
#include <qbitmap.h>
#include <qtabbar.h>
#include <qpopupmenu.h>
#include <qobjectlist.h>
#include <qimage.h>
#include <qtimer.h>
#include <qpixmapcache.h>
#include <qradiobutton.h>
#include <qcombobox.h>
#include <qdrawutil.h>
#include <qwidgetlist.h>
#include <qtoolbutton.h>
#include <qheader.h>
#include <unistd.h>
#include <qmenubar.h>
#include <stdio.h>
#include "htmlmasks.h"
#include "embeddata.h"
typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
QColorGroup &, bool, bool);
QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
void TransMenuHandler::stripePixmap(QPixmap &pix, const QColor &color)
{
QImage img(pix.convertToImage());
QImageEffect::fade(img, 0.9, color);
int x, y;
int r, g, b;
for(y=0; y < img.height(); y+=3){
unsigned int *data = (unsigned int *) img.scanLine(y);
for(x=0; x < img.width(); ++x){
r = qRed(data[x]);
g = qGreen(data[x]);
b = qBlue(data[x]);
if(r-10)
r-=10;
if(g-10)
g-=10;
if(b-10)
b-=10;
data[x] = qRgb(r, g, b);
}
}
pix.convertFromImage(img);
}
TransMenuHandler::TransMenuHandler(QObject *parent)
: QObject(parent)
{
pixDict.setAutoDelete(true);
reloadSettings();
}
void TransMenuHandler::reloadSettings()
{
pixDict.clear();
Config config ( "qpe" );
config. setGroup ( "MosfetMenus" );
type = config. readNumEntry("Type", TransStippleBg);
color = QColor ( config. readEntry("Color", QApplication::palette().active().button().name()));
fgColor = QColor ( config. readEntry("TextColor", QApplication::palette().active().text().name()));
opacity = config. readNumEntry("Opacity", 10);
if ( opacity < -20 )
opacity = 20;
else if ( opacity > 20 )
opacity = 20;
shadowText = config. readBoolEntry("ShadowText", true);
}
bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev)
{
QWidget *p = (QWidget *)obj;
if(ev->type() == QEvent::Show){
if(type == TransStippleBg || type == TransStippleBtn ||
type == Custom){
QApplication::syncX();
QPixmap *pix = new QPixmap;
if(p->testWFlags(Qt::WType_Popup)){
QRect r(p->x(), p->y(), p->width(), p->height());
QRect deskR = QApplication::desktop()->rect();
if(r.right() > deskR.right() || r.bottom() > deskR.bottom()){
r.setBottom(deskR.bottom());
r.setRight(deskR.right());
}
*pix = QPixmap::grabWindow(QApplication::desktop()-> winId(), r.x(), r.y(),
r.width(), r.height());
}
else{ // tear off menu
pix->resize(p->width(), p->height());
pix->fill(Qt::black.rgb());
}
if(type == TransStippleBg){
stripePixmap(*pix, p->colorGroup().background());
}
else if(type == TransStippleBtn){
stripePixmap(*pix, p->colorGroup().button());
}
else{
QPixmapEffect::fade(*pix, (((float)opacity)+80)*0.01, color);
}
if (p->inherits("QPopupMenu"))
pixDict.insert(p->winId(), pix);
else {
p->setBackgroundPixmap(*pix);
QObjectList *ol = p-> queryList("QWidget");
for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
QWidget *wid = (QWidget *) it.current ( );
wid-> setBackgroundPixmap(*pix);
wid-> setBackgroundOrigin(QWidget::ParentOrigin);
}
delete ol;
}
}
}
else if(ev->type() == QEvent::Hide){
if(type == TransStippleBg || type == TransStippleBtn ||
type == Custom){
// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
if (p->inherits("QPopupMenu"))
pixDict.remove(p->winId());
else {
p->setBackgroundMode(QWidget::PaletteBackground);
QObjectList *ol = p-> queryList("QWidget");
for ( QObjectListIt it( *ol ); it. current ( ); ++it ) {
QWidget *wid = (QWidget *) it.current ( );
wid-> setBackgroundMode( QWidget::PaletteBackground );
}
delete ol;
}
}
}
- else if(ev->type() == QEvent::Paint){
- if(type == TransStippleBg || type == TransStippleBtn ||
- type == Custom){
-// qWarning("Deleting menu pixmap, width %d", pixDict.find(p->winId())->width());
-
- if (!p->inherits("QPopupMenu"))
- p->erase();
- }
- }
return(false);
}
LiquidStyle::LiquidStyle()
:QWindowsStyle()
{
setName ( "LiquidStyle" );
btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
btnMaskBmp.setMask(btnMaskBmp);
htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
htmlBtnMaskBmp.setMask(htmlBtnMaskBmp);
headerHoverID = -1;
highlightWidget = NULL;
setButtonDefaultIndicatorWidth(0);
btnDict.setAutoDelete(true);
bevelFillDict.setAutoDelete(true);
smallBevelFillDict.setAutoDelete(true);
customBtnColorList.setAutoDelete(true);
customBtnIconList.setAutoDelete(true);
customBtnLabelList.setAutoDelete(true);
rMatrix.rotate(270.0);
highcolor = QPixmap::defaultDepth() > 8;
btnBorderPix = new QPixmap;
btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
btnBlendPix = new QPixmap;
btnBlendPix->convertFromImage(qembed_findImage("buttonborder"));
bevelFillPix = new QPixmap;
bevelFillPix->convertFromImage(qembed_findImage("clear_fill_large"));
smallBevelFillPix = new QPixmap;
smallBevelFillPix->convertFromImage(qembed_findImage("clear_fill_small"));
// new stuff
vsbSliderFillPix = menuPix = NULL;
menuHandler = new TransMenuHandler(this);
setScrollBarExtent(15, 15);
int i;
for(i=0; i < BITMAP_ITEMS; ++i){
pixmaps[i] = NULL;
}
oldSliderThickness = sliderThickness();
setSliderThickness(11);
}
LiquidStyle::~LiquidStyle()
{
if(btnBorderPix)
delete btnBorderPix;
if(btnBlendPix)
delete btnBlendPix;
if(bevelFillPix)
delete bevelFillPix;
if(smallBevelFillPix)
delete smallBevelFillPix;
if(vsbSliderFillPix)
delete vsbSliderFillPix;
if(menuPix)
delete menuPix;
setScrollBarExtent(16, 16);
setSliderThickness(oldSliderThickness);
int i;
for(i=0; i < BITMAP_ITEMS; ++i){
if(pixmaps[i])
delete pixmaps[i];
}
}
void LiquidStyle::drawClearBevel(QPainter *p, int x, int y, int w, int h,
const QColor &c, const QColor &bg)
{
QPen oldPen = p->pen(); // headers need this
int x2 = x+w-1;
int y2 = y+h-1;
// outer dark rect
p->setPen(c.dark(130));
p->drawLine(x, y+2, x, y2-2); // l
p->drawLine(x2, y+2, x2, y2-2); // r
p->drawLine(x+2, y, x2-2, y); // t
p->drawLine(x+2, y2, x2-2, y2); // b
p->drawPoint(x+1, y+1); // tl
p->drawPoint(x2-1, y+1); // tr
p->drawPoint(x+1, y2-1); // bl
p->drawPoint(x2-1, y2-1); // br
// inner top light lines
p->setPen(c.light(105));
p->drawLine(x+2, y+1, x2-2, y+1);
p->drawLine(x+1, y+2, x2-1, y+2);
p->drawLine(x+1, y+3, x+2, y+3);
p->drawLine(x2-2, y+3, x2-1, y+3);
p->drawPoint(x+1, y+4);
p->drawPoint(x2-1, y+4);
// inner bottom light lines
p->setPen(c.light(110));
p->drawLine(x+2, y2-1, x2-2, y2-1);
p->drawLine(x+1, y2-2, x2-1, y2-2);
p->drawLine(x+1, y2-3, x+2, y2-3);
p->drawLine(x2-2, y2-3, x2-1, y2-3);
p->drawPoint(x+1, y2-4);
p->drawPoint(x2-1, y2-4);
// inner left mid lines
//p->setPen(c.light(105));
p->setPen(c);
p->drawLine(x+1, y+5, x+1, y2-5);
p->drawLine(x+2, y+4, x+2, y2-4);
// inner right mid lines
p->drawLine(x2-1, y+5, x2-1, y2-5);
p->drawLine(x2-2, y+4, x2-2, y2-4);
// fill
QPixmap *pix;
if(h >= 32){
pix = bevelFillDict.find(c.rgb());
if(!pix){
int h, s, v;
c.hsv(&h, &s, &v);
pix = new QPixmap(*bevelFillPix);
adjustHSV(*pix, h, s, v);
bevelFillDict.insert(c.rgb(), pix);
}
}
else{
pix = smallBevelFillDict.find(c.rgb());
if(!pix){
int h, s, v;
c.hsv(&h, &s, &v);
pix = new QPixmap(*smallBevelFillPix);
adjustHSV(*pix, h, s, v);
smallBevelFillDict.insert(c.rgb(), pix);
}
}
p->drawTiledPixmap(x+3, y+3, w-6, h-6, *pix);
// blend
int red, green, blue;
QColor btnColor(c.dark(130));
red = (btnColor.red() >> 1) + (bg.red() >> 1);
green = (btnColor.green() >> 1) + (bg.green() >> 1);
blue = (btnColor.blue() >> 1) + (bg.blue() >> 1);
btnColor.setRgb(red, green, blue);
p->setPen(btnColor);
p->drawPoint(x+1, y);
p->drawPoint(x, y+1);
p->drawPoint(x+1, y2);
p->drawPoint(x, y2-1);
p->drawPoint(x2-1, y);
p->drawPoint(x2, y+1);
p->drawPoint(x2-1, y2);
p->drawPoint(x2, y2-1);
p->setPen(oldPen);
}
void LiquidStyle::drawRoundButton(QPainter *painter, const QColor &c,
const QColor &back, int x, int y, int w, int h,
bool supportPushDown, bool pushedDown,
bool autoDefault, bool isMasked)
{
if(w < 21 || h < 21){
drawClearBevel(painter, x, y, w, h, c, back);
return;
}
if(supportPushDown){
--w, --h;
}
/* We don't make the round buttons smaller, since they don't look as good
if(autoDefault){
w = w-buttonDefaultIndicatorWidth()*2;
h = h-buttonDefaultIndicatorWidth()*2;
}*/
QPixmap *pix = btnDict.find(c.rgb());
if(!pix){
int h, s, v;
c.hsv(&h, &s, &v);
pix = new QPixmap(*btnBorderPix);
adjustHSV(*pix, h, s, v);
btnDict.insert(c.rgb(), pix);
}
int x2 = x+w-1;
int y2 = y+h-1;
int bx2 = pix->width()-1;
int by2 = pix->height()-1;
QPixmap tmpPix(w, h);
QPixmap tilePix;
QPainter p;
p.begin(&tmpPix);
// do the fill
p.drawPixmap(0, 0, *pix, 0, 0, 10, 10); // tl
p.drawPixmap(x2-9, 0, *pix, bx2-9, 0, 10, 10); // tr
p.drawPixmap(0, y2-9, *pix, 0, by2-9, 10, 10); // bl
p.drawPixmap(x2-9, y2-9, *pix, bx2-9, by2-9, 10, 10); // br
// edges
tilePix.resize(pix->width()-20, 10);
// top
bitBlt(&tilePix, 0, 0, pix, 10, 0, pix->width()-20, 10);
p.drawTiledPixmap(10, 0, w-20, 10, tilePix);
// bottom
bitBlt(&tilePix, 0, 0, pix, 10, by2-9, pix->width()-20, 20);
p.drawTiledPixmap(10, y2-9, w-20, 10, tilePix);
// left
tilePix.resize(10, pix->height()-20);
bitBlt(&tilePix, 0, 0, pix, 0, 10, 10, pix->height()-20);
p.drawTiledPixmap(0, 10, 10, h-20, tilePix);
// right
bitBlt(&tilePix, 0, 0, pix, bx2-9, 10, 10, pix->height()-20);
p.drawTiledPixmap(x2-9, 10, 10, h-20, tilePix);
// middle
tilePix.resize(pix->width()-20, pix->height()-20);
bitBlt(&tilePix, 0, 0, pix, 10, 10, pix->width()-20, pix->height()-20);
p.drawTiledPixmap(10, 10, w-20, h-20, tilePix);
// do the blend
QBitmap blendMask;
if(!isMasked){
//QRgb bgRgb = back.rgb();
//QRgb fgRgb = c.rgb();
//int r, g, b;
//r = (int)(qRed(bgRgb)*0.75 + qRed(fgRgb)*0.25);
//g = (int)(qGreen(bgRgb)*0.75 + qGreen(fgRgb)*0.25);
//b = (int)(qBlue(bgRgb)*0.75 + qBlue(fgRgb)*0.25);
//QColor blendColor(r, g, b);
int hue, sat, v1, v2;
QColor blendColor(autoDefault ? c : back);
back.hsv(&hue, &sat, &v1);
blendColor.hsv(&hue, &sat, &v2);
if(v2 > v1)
blendColor.setHsv(hue, sat, (int)(v1*0.75 + v2*0.25));
pix = btnBorderDict.find(blendColor.rgb());
if(!pix){
int h, s, v;
blendColor.hsv(&h, &s, &v);
pix = new QPixmap(*btnBlendPix);
adjustHSV(*pix, h, s, v);
btnBorderDict.insert(blendColor.rgb(), pix);
}
}
else{
pix = pushedDown ? getPixmap(HTMLBtnBorderDown) :
getPixmap(HTMLBtnBorder);
@@ -584,608 +575,607 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
pixmaps[RadioOnHover] = processEmbedded("radio_down", btnHoverH, btnHoverS,
btnHoverV, true);
break;
case RadioOffHover:
pixmaps[RadioOffHover] = processEmbedded("radio", btnH, btnS, btnV, true);
break;
case TabDown:
pixmaps[TabDown] = processEmbedded("tab", btnH, btnS, btnV, true);
break;
case TabFocus:
pixmaps[TabFocus] = processEmbedded("tab", btnHoverH, btnHoverS,
btnHoverS, true);
break;
case CBDown:
pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV, true);
break;
case CBDownHover:
pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH,
btnHoverS, btnHoverV, true);
break;
case CBHover:
pixmaps[CBHover] = processEmbedded("checkbox", btnH, btnS, btnV, true);
break;
case HSlider:
pixmaps[HSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
break;
case VSlider:
pixmaps[VSlider] = processEmbedded("sliderarrow", btnH, btnS, btnV, true);
*pixmaps[VSlider] = pixmaps[VSlider]->xForm(rMatrix);
break;
case RadioOff:
pixmaps[RadioOff] = processEmbedded("radio", bH, bS, bV, true);
break;
case Tab:
pixmaps[Tab] = processEmbedded("tab", bH, bS, bV, true);
break;
case CB:
pixmaps[CB] = processEmbedded("checkbox", bH, bS, bV, true);
break;
case VSBSliderTop:
pixmaps[VSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
break;
case VSBSliderBtm:
pixmaps[VSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
break;
case VSBSliderMid:
pixmaps[VSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
break;
case VSBSliderTopHover:
pixmaps[VSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
break;
case VSBSliderBtmHover:
pixmaps[VSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
break;
case VSBSliderMidHover:
pixmaps[VSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
break;
case HSBSliderTop:
pixmaps[HSBSliderTop] = processEmbedded("sbslider_top", btnH, btnS, btnV, true);
*pixmaps[HSBSliderTop] = pixmaps[HSBSliderTop]->xForm(rMatrix);
break;
case HSBSliderBtm:
pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
*pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix);
break;
case HSBSliderMid:
pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
*pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix);
break;
case HSBSliderTopHover:
pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
*pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix);
break;
case HSBSliderBtmHover:
pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
*pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix);
break;
case HSBSliderMidHover:
pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
*pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix);
break;
case VSBSliderTopBg:
pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
break;
case VSBSliderBtmBg:
pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
break;
case VSBSliderMidBg:
pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
break;
case HSBSliderTopBg:
pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
*pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
break;
case HSBSliderBtmBg:
pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
*pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
break;
case HSBSliderMidBg:
pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
*pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix);
break;
default:
break;
}
return(pixmaps[item]);
}
void LiquidStyle::polish(QPalette &appPal)
{
int i;
for(i=0; i < BITMAP_ITEMS; ++i){
if(pixmaps[i]){
delete pixmaps[i];
pixmaps[i] = NULL;
}
}
QWidgetList *list = QApplication::allWidgets();
QWidgetListIt it( *list );
QWidget *w;
while ((w=it.current()) != 0 ){
++it;
if(w->inherits("QPushButton")){
unapplyCustomAttributes((QPushButton *)w);
}
}
loadCustomButtons();
lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
btnDict.clear();
btnBorderDict.clear();
bevelFillDict.clear();
smallBevelFillDict.clear();
Config config ( "qpe" );
QPalette pal = QApplication::palette();
// button color stuff
config. setGroup ( "Appearance" );
QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( )));
if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) {
// force button color to be different from background
QBrush btnBrush(QColor(200, 202, 228));
appPal.setBrush(QColorGroup::Button, btnBrush);
}
c.hsv(&btnH, &btnS, &btnV);
c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV);
// menu pixmap
if(!menuPix){
menuPix = new QPixmap;
menuPix->resize(64, 64);
}
QPainter painter;
menuPix->fill(c.rgb());
painter.begin(menuPix);
painter.setPen(c.dark(105));
for(i=0; i < 63; i+=4){
painter.drawLine(0, i, 63, i);
painter.drawLine(0, i+1, 63, i+1);
};
painter.end();
menuBrush.setColor(c);
menuBrush.setPixmap(*menuPix);
// pager brush
c = c.dark(120);
QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
if(!pix){
int h, s, v;
c.hsv(&h, &s, &v);
pix = new QPixmap(*smallBevelFillPix);
adjustHSV(*pix, h, s, v);
smallBevelFillDict.insert(c.rgb(), pix);
}
pagerHoverBrush.setColor(c);
pagerHoverBrush.setPixmap(*pix);
c = c.dark(120);
pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
if(!pix){
int h, s, v;
c.hsv(&h, &s, &v);
pix = new QPixmap(*smallBevelFillPix);
adjustHSV(*pix, h, s, v);
smallBevelFillDict.insert(c.rgb(), pix);
}
pagerBrush.setColor(c);
pagerBrush.setPixmap(*pix);
// background color stuff
c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));
c.hsv(&bH, &bS, &bV);
c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
// FIXME?
if(vsbSliderFillPix)
delete vsbSliderFillPix;
vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix));
adjustHSV(*vsbSliderFillPix, bH, bS, bV);
// background brush
QPixmap wallPaper(32, 32);
wallPaper.fill(c.rgb());
painter.begin(&wallPaper);
for(i=0; i < 32; i+=4){
painter.setPen(c.dark(105));
painter.drawLine(0, i, 32, i);
painter.setPen(c.dark(103));
painter.drawLine(0, i+1, 32, i+1);
};
painter.end();
bgBrush.setColor(c);
bgBrush.setPixmap(wallPaper);
appPal.setBrush(QColorGroup::Background, bgBrush);
// lineedits
c = QColor ( config. readEntry("Base", ( Qt::white). name ( )));
QPixmap basePix;
basePix.resize(32, 32);
basePix.fill(c.rgb());
painter.begin(&basePix);
painter.setPen(c.dark(105));
for(i=0; i < 32; i+=4){
painter.drawLine(0, i, 32, i);
painter.drawLine(0, i+1, 32, i+1);
};
painter.end();
baseBrush.setColor(c);
baseBrush.setPixmap(basePix);
it.toFirst();
while ((w=it.current()) != 0 ){
++it;
if(w->inherits("QLineEdit")){
QPalette pal = w->palette();
pal.setBrush(QColorGroup::Base, baseBrush);
w->setPalette(pal);
}
else if(w->inherits("QPushButton")){
applyCustomAttributes((QPushButton *)w);
}
}
}
void LiquidStyle::polish(QWidget *w)
{
if(w->inherits("QMenuBar")){
//((QFrame*)w)->setLineWidth(0);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QPopupMenu"))
w->setBackgroundMode(QWidget::NoBackground);
- else if(w-> testWFlags(Qt::WType_Popup)) {
- printf("install popup: %s\n", w-> className ( ));
+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
w->installEventFilter(menuHandler);
}
if(w->isTopLevel()){
return;
}
w-> setBackgroundOrigin ( QWidget::ParentOrigin );
if(w->inherits("QComboBox") ||
w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
w->installEventFilter(this);
}
if(w->inherits("QLineEdit")){
QPalette pal = w->palette();
pal.setBrush(QColorGroup::Base, baseBrush);
w->setPalette(pal);
}
if(w->inherits("QPushButton")){
applyCustomAttributes((QPushButton *)w);
w->installEventFilter(this);
}
if(w->inherits("QButton") || w-> inherits("QComboBox")){
w-> setBackgroundMode ( QWidget::PaletteBackground );
}
bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
qstrcmp(w->name(), "qt_clipped_viewport") == 0;
bool isViewportChild = w->parent() &&
((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
(qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
if(isViewport && w->parent() && qstrcmp(w->parent()->name(), "proxyview") == 0){
w->setBackgroundMode(QWidget::X11ParentRelative);
return;
}
if(isViewportChild){
if(w->inherits("QButton") || w->inherits("QComboBox")){
if(w->parent()){ // heh, only way to test for KHTML children ;-)
if(w->parent()->parent()){
if(w->parent()->parent()->parent() &&
w->parent()->parent()->parent()->inherits("KHTMLView")){
w->setAutoMask(true);
w->setBackgroundMode(QWidget::NoBackground);
}
}
}
return;
}
}
if(w->inherits("QHeader")){
w->setMouseTracking(true);
w->installEventFilter(this);
}
if(w-> inherits("QToolButton")) {
((QToolButton*)w)->setAutoRaise (false);
}
if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
return;
}
if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
palette().active().brush(QColorGroup::Background).pixmap()){
qWarning("No parent pixmap for child widget %s", w->className());
return;
}
if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
!( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
if(w->backgroundMode() == QWidget::PaletteBackground ||
w->backgroundMode() == QWidget::PaletteButton){
w->setBackgroundMode(QWidget::X11ParentRelative);
}
}
if(w->inherits("QToolBar")){
w->installEventFilter(this);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
}
void LiquidStyle::unPolish(QWidget *w)
{
if(w->inherits("QMenuBar")){
((QFrame *)w)->setLineWidth(1);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QPopupMenu"))
w->setBackgroundMode(QWidget::PaletteButton);
- else if(w-> testWFlags(Qt::WType_Popup)) {
+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
w->removeEventFilter(menuHandler);
}
if(w->isTopLevel())
return;
// for viewport children, don't just check for NoBackground....
bool isViewportChild = w->parent() &&
((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
(qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
w->setPalette(QApplication::palette());
if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
if(w->inherits("QPushButton"))
w->setBackgroundMode(QWidget::PaletteButton);
else
w->setBackgroundMode(QWidget::PaletteBackground);
}
if(isViewportChild)
w->setAutoMask(false);
if(w->inherits("QPushButton")){
unapplyCustomAttributes((QPushButton *)w);
w->removeEventFilter(this);
}
/*
if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
w-> setBackgroundMode ( PaletteBackground );
}
*/
if(w->inherits("QComboBox") ||
w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
w->removeEventFilter(this);
}
if(w->inherits("QButton") || w->inherits("QComboBox")){
if(w->parent() && w->parent()->inherits("KHTMLPart")){
w->setAutoMask(false);
}
}
if(w->inherits("QToolBar")){
w->removeEventFilter(this);
w->setBackgroundMode(QWidget::PaletteBackground);
return;
}
if(w->inherits("QHeader")){
w->setMouseTracking(false);
w->removeEventFilter(this);
}
}
void LiquidStyle::polish(QApplication *app)
{
QWindowsStyle::polish(app);
menuAni = app->isEffectEnabled(UI_AnimateMenu);
menuFade = app->isEffectEnabled(UI_FadeMenu);
if(menuAni)
app->setEffectEnabled(UI_AnimateMenu, false);
if(menuFade)
app->setEffectEnabled(UI_FadeMenu, false);
qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
}
void LiquidStyle::unPolish(QApplication *app)
{
QWindowsStyle::unPolish(app);
app->setEffectEnabled(UI_AnimateMenu, menuAni);
app->setEffectEnabled(UI_FadeMenu, menuFade);
qt_set_draw_menu_bar_impl ( 0 );
}
/*
* This is a fun method ;-) Here's an overview. KToolBar grabs resize to
* force everything to erase and repaint on resize. This is going away, I'm
* trying to get shaped widgets to work right without masking. QPushButton,
* QComboBox, and Panel applet handles capture mouse enter and leaves in order
* to set the highlightwidget and repaint for mouse hovers. CheckBoxes and
* RadioButtons need to do this differently. Qt buffers these in pixmaps and
* caches them in QPixmapCache, which is bad for doing things like hover
* because the style methods aren't called in paintEvents if everything
* is cached. We use our own Paint event handler instead. Taskbuttons and
* pager buttons draw into a pixmap buffer, so we handle those with palette
* modifications. For QHeader, different header items are actually one widget
* that draws multiple items, so we need to check which ID is hightlighted
* and draw it. Finally, we also check enter and leave events for QLineEdit,
* since if it's inside a combobox we want to highlight the combobox during
* hovering in the edit.
*/
bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
{
if(obj->inherits("QToolBar")){
if(ev->type() == QEvent::Resize){
const QObjectList *tbChildList = obj->children();
QObjectListIt it(*tbChildList);
QObject *child;
while((child = it.current()) != NULL){
++it;
if(child->isWidgetType())
((QWidget *)child)->repaint(true);
}
}
}
else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
QWidget *btn = (QWidget *)obj;
if(ev->type() == QEvent::Enter){
if(btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if(btn == highlightWidget){
highlightWidget = NULL;
btn->repaint(false);
}
}
}
else if(obj->inherits("QToolButton")){
QToolButton *btn = (QToolButton *)btn;
if(!btn->autoRaise()){
if(btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
QWidget *btn = (QWidget *)obj;
if(btn == highlightWidget){
highlightWidget = NULL;
btn->repaint(false);
}
}
else
highlightWidget = NULL;
}
else if(obj->inherits("QScrollBar")){
QScrollBar *sb = (QScrollBar *)obj;
if(ev->type() == QEvent::Enter){
if(sb->isEnabled()){
highlightWidget = sb;
sb->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if(sb == highlightWidget && !sb->draggingSlider()){
highlightWidget = NULL;
sb->repaint(false);
}
}
else if(ev->type() == QEvent::MouseButtonRelease){
QMouseEvent *me = (QMouseEvent *)ev;
if(sb == highlightWidget && !sb->rect().contains(me->pos())){
highlightWidget = NULL;
sb->repaint(false);
}
}
}
else if(obj->inherits("QLineEdit")){
if(obj->parent() && obj->parent()->inherits("QComboBox")){
QWidget *btn = (QComboBox *)obj->parent();
if(ev->type() == QEvent::Enter){
if (btn->isEnabled()){
highlightWidget = btn;
btn->repaint(false);
}
}
else if(ev->type() == QEvent::Leave){
if (btn == highlightWidget)
highlightWidget = NULL;
btn->repaint(false);
}
}
}
else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
QButton *btn = (QButton *)obj;
bool isRadio = obj->inherits("QRadioButton");
if(ev->type() == QEvent::Paint){
//if(btn->autoMask())
btn->erase();
QPainter p;
p.begin(btn);
QFontMetrics fm = btn->fontMetrics();
QSize lsz = fm.size(ShowPrefix, btn->text());
QSize sz = isRadio ? exclusiveIndicatorSize()
: indicatorSize();
if(btn->hasFocus()){
QRect r = QRect(0, 0, btn->width(), btn->height());
p.setPen(btn->colorGroup().button().dark(140));
p.drawLine(r.x()+1, r.y(), r.right()-1, r.y());
p.drawLine(r.x(), r.y()+1, r.x(), r.bottom()-1);
p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
}
int x = 0;
int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
if(isRadio)
drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->isOn(),
btn->isDown(), btn->isEnabled());
else
drawIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->state(), btn->isDown(),
btn->isEnabled());
x = sz.width() + 6;
y = 0;
drawItem(&p, sz.width()+6+1, 0, btn->width()-(sz.width()+6+1),
btn->height(), AlignLeft|AlignVCenter|ShowPrefix,
btn->colorGroup(), btn->isEnabled(),
btn->pixmap(), btn->text());
p.end();
return(true);
}
// for hover, just redraw the indicator (not the text)
else if((ev->type() == QEvent::Enter && btn->isEnabled()) ||
(ev->type() == QEvent::Leave && btn == highlightWidget)){
QButton *btn = (QButton *)obj;
bool isRadio = obj->inherits("QRadioButton");
if(ev->type() == QEvent::Enter)
highlightWidget = btn;
else
highlightWidget = NULL;
QFontMetrics fm = btn->fontMetrics();
QSize lsz = fm.size(ShowPrefix, btn->text());
QSize sz = isRadio ? exclusiveIndicatorSize()
: indicatorSize();
int x = 0;
int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
//if(btn->autoMask())
// btn->erase(x+1, y+1, sz.width()-2, sz.height()-2);
QPainter p;
p.begin(btn);
if(isRadio)
drawExclusiveIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->isOn(),
btn->isDown(), btn->isEnabled());
else
drawIndicator(&p, x, y, sz.width(), sz.height(),
btn->colorGroup(), btn->state(), btn->isDown(),
btn->isEnabled());
p.end();
}
}
else if(obj->inherits("QHeader")){
QHeader *hw = (QHeader *)obj;
if(ev->type() == QEvent::Enter){
currentHeader = hw;
headerHoverID = -1;
}
else if(ev->type() == QEvent::Leave){
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp
index fca7c06..d9aa8ef 100644
--- a/noncore/styles/liquid/plugin.cpp
+++ b/noncore/styles/liquid/plugin.cpp
@@ -1,29 +1,29 @@
#include "liquid.h"
extern "C" {
QStyle* allocate ( );
int minor_version ( );
int major_version ( );
const char *description ( );
}
QStyle* allocate ( )
{
return new LiquidStyle ( );
}
int minor_version ( )
{
return 0;
}
int major_version ( )
{
return 1;
}
const char *description ( )
{
- return "High performance liquid plugin";
+ return "High Performance Liquid";
}