alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* new background drawing code; 9 segments + center, documented at http://techbase.kde.org/Projects/Plasma/Theme#Current_Theme_Elements

Browse Source 
* introduce contentsRect() and pass that into paintInterface instead of a widget

i missed monday so much i wanted to break SOMETHING, so i broke all the plasma widgets. i rock! ;P

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=692002
This commit is contained in:
Aaron J. Seigo 2007-07-24 21:04:31 +00:00
parent 8970a02211
commit 2c251118fd
2 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
applet.cpp
View File

@ -126,10 +126,35 @@ public:
applet->config().isImmutable());
}
void paintBackground(QPainter* painter, Applet* q)
void paintBackground(QPainter* p, Applet* q)
{
background->resize(q->boundingRect().size());
background->paint(painter, q->boundingRect());
QRect rect = q->boundingRect().toRect();
const int w = rect.width();
const int h = rect.height();
p->setRenderHint(QPainter::SmoothPixmapTransform);
background->resize();
const int topHeight = background->elementSize("top").height(); // 23
const int leftWidth = background->elementSize("left").width(); //20;
const int rightWidth = background->elementSize("right").width(); // 20
const int bottomHeight = background->elementSize("bottom").height(); //25;
const int lrWidths = leftWidth + rightWidth;
const int tbHeights = topHeight + bottomHeight;
background->paint(p, QRect(0, 0, leftWidth, topHeight), "topleft");
background->paint(p, QRect(leftWidth, 0, w - lrWidths, topHeight), "top");
background->paint(p, QRect(w - rightWidth, 0, rightWidth, topHeight), "topright");
background->paint(p, QRect(0, topHeight, leftWidth, h - tbHeights), "left");
background->paint(p, QRect(w - rightWidth, topHeight, rightWidth, h - tbHeights), "right");
background->paint(p, QRect(0, h - bottomHeight, leftWidth, bottomHeight), "bottomleft");
background->paint(p, QRect(leftWidth, h - bottomHeight, w - lrWidths, bottomHeight), "bottom");
background->paint(p, QRect(w - rightWidth, h - bottomHeight, rightWidth, bottomHeight), "bottomright");
background->resize(rect.size());
background->paint(p, QRect(leftWidth, topHeight, w - lrWidths, h - tbHeights), "center");
}
static uint nextId()
@ -384,6 +409,8 @@ QRectF Applet::boundingRect () const
void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(widget)
if (d->background) {
d->paintBackground(painter, this);
}
@ -392,22 +419,20 @@ void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
return;
}
paintInterface(painter, option, widget);
paintInterface(painter, option, contentsRect());
//TODO: interface overlays on hover
}
void Applet::paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
void Applet::paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option,
const QRect & contentsRect)
{
Q_UNUSED(widget)
Q_UNUSED(contentsRect)
if (d->scriptEngine) {
d->scriptEngine->paintInterface(painter, option);
} else if (!d->background) {
// we should not be in here, the child applet probably screwed up
setDrawStandardBackground(true);
kDebug() << "Applet::paintInterface ... we should not be in here. check your painInterface method" << endl;
d->paintBackground(painter, this);
} else {
kDebug() << "Applet::paintInterface() default impl" << endl;
}
}
@ -429,6 +454,22 @@ Location Applet::location() const
return static_cast<Corona*>(scene())->location();
}
QRect Applet::contentsRect() const
{
QRect rect = boundingRect().toRect();
if (!d->background) {
return rect;
}
const int topHeight = d->background->elementSize("top").height();
const int leftWidth = d->background->elementSize("left").width();
const int rightWidth = d->background->elementSize("right").width();
const int bottomHeight = d->background->elementSize("bottom").height();
rect.adjust(leftWidth, topHeight, 0 - leftWidth - rightWidth, 0 - topHeight - bottomHeight);
return rect;
}
QString Applet::globalName() const
{
if (!d->appletDescription.isValid()) {

17
applet.h
View File

@ -43,7 +43,7 @@ class Package;
class PLASMA_EXPORT Applet : public QObject, public Widget
{
Q_OBJECT
// Q_PROPERTY( QRectF maxSizeHint READ maxSizeHint ) // Not sure why this fails
// Q_PROPERTY( QRectF maxSizeHint READ maxSizeHint )
Q_PROPERTY( bool hasConfigurationInterface READ hasConfigurationInterface WRITE setHasConfigurationInterface )
Q_PROPERTY( QString name READ name )
Q_PROPERTY( QString category READ category )
@ -168,7 +168,13 @@ class PLASMA_EXPORT Applet : public QObject, public Widget
* An applet may choose to violate this size hint, but should try and
* respect it as much as possible.
*/
QRectF maxSizeHint() const;
// QRectF maxSizeHint() const;
/**
* Returns the area within which contents can be painted. If there is no
* background, then this is equivalent to boundingRect().
**/
QRect contentsRect() const;
/**
* Returns a list of all known applets in a hash keyed by a unique
@ -251,11 +257,14 @@ class PLASMA_EXPORT Applet : public QObject, public Widget
/**
* This method is called when the interface should be painted.
*
* @see QGraphicsItem::paint
* @param painter the QPainter to use to do the paintiner
* @param option the style options object
* @param contentsRect the rect to paint within; automatically adjusted for
* the background, if any
**/
virtual void paintInterface(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *widget = 0);
const QRect& contentsRect);
/**
* Returns the user-visible name for the applet, as specified in the