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

* more readable flag names

Browse Source 
* add a DrawAllBorders for brevity's sake
* add operators for the border flags

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=771707
This commit is contained in:
Aaron J. Seigo 2008-02-06 19:24:48 +00:00
parent 7f3aea19ff
commit b2480a105a
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
svgpanel.cpp
View File

@ -32,7 +32,7 @@ class SvgPanel::Private
{
public:
Private()
: bFlags(DrawTop|DrawBottom|DrawLeft|DrawRight|ContentAtOrigin),
: bFlags(DrawAllBorders|ContentAtOrigin),
cachedBackground(0)
{
}
@ -193,53 +193,53 @@ void SvgPanel::paint(QPainter* painter, const QRectF& rect)
}
//EDGES
if (d->bFlags & DrawTop) {
if (d->bFlags & DrawLeft) {
if (d->bFlags & DrawTopBorder) {
if (d->bFlags & DrawLeftBorder) {
d->background->paint(&p, QRect(leftOffset, topOffset, d->leftWidth, d->topHeight), "topleft");
}
if (d->bFlags & DrawRight) {
if (d->bFlags & DrawRightBorder) {
d->background->paint(&p, QRect(rightOffset, topOffset, d->rightWidth, d->topHeight), "topright");
}
}
if (d->bFlags & DrawBottom) {
if (d->bFlags & DrawLeft) {
if (d->bFlags & DrawBottomBorder) {
if (d->bFlags & DrawLeftBorder) {
d->background->paint(&p, QRect(leftOffset, bottomOffset, d->leftWidth, d->bottomHeight), "bottomleft");
}
if (d->bFlags & DrawRight) {
if (d->bFlags & DrawRightBorder) {
d->background->paint(&p, QRect(rightOffset, bottomOffset, d->rightWidth, d->bottomHeight), "bottomright");
}
}
//SIDES
if (d->stretchBorders) {
if (d->bFlags & DrawLeft) {
if (d->bFlags & DrawLeftBorder) {
d->background->resize(d->background->size().width(), scaledSize.height());
d->background->paint(&p, QRect(leftOffset, contentTop, d->leftWidth, contentHeight), "left");
d->background->resize();
}
if (d->bFlags & DrawRight) {
if (d->bFlags & DrawRightBorder) {
d->background->resize(d->background->size().width(), scaledSize.height());
d->background->paint(&p, QRect(rightOffset, contentTop, d->rightWidth, contentHeight), "right");
d->background->resize();
}
if (d->bFlags & DrawTop) {
if (d->bFlags & DrawTopBorder) {
d->background->resize(scaledSize.width(), d->background->size().height());
d->background->paint(&p, QRect(contentLeft, topOffset, contentWidth, d->topHeight), "top");
d->background->resize();
}
if (d->bFlags & DrawBottom) {
if (d->bFlags & DrawBottomBorder) {
d->background->resize(scaledSize.width(), d->background->size().height());
d->background->paint(&p, QRect(contentLeft, bottomOffset, contentWidth, d->bottomHeight), "bottom");
d->background->resize();
}
} else {
if (d->bFlags & DrawLeft) {
if (d->bFlags & DrawLeftBorder) {
QPixmap left(d->leftWidth, leftHeight);
left.fill(Qt::transparent);
@ -252,7 +252,7 @@ void SvgPanel::paint(QPainter* painter, const QRectF& rect)
p.drawTiledPixmap(QRect(leftOffset, contentTop, d->leftWidth, contentHeight), left);
}
if (d->bFlags & DrawRight) {
if (d->bFlags & DrawRightBorder) {
QPixmap right(d->rightWidth, leftHeight);
right.fill(Qt::transparent);
@ -265,7 +265,7 @@ void SvgPanel::paint(QPainter* painter, const QRectF& rect)
p.drawTiledPixmap(QRect(rightOffset, contentTop, d->rightWidth, contentHeight), right);
}
if (d->bFlags & DrawTop) {
if (d->bFlags & DrawTopBorder) {
QPixmap top(topWidth, d->topHeight);
top.fill(Qt::transparent);
@ -278,7 +278,7 @@ void SvgPanel::paint(QPainter* painter, const QRectF& rect)
p.drawTiledPixmap(QRect(contentLeft, topOffset, contentWidth, d->topHeight), top);
}
if (d->bFlags & DrawBottom) {
if (d->bFlags & DrawBottomBorder) {
QPixmap bottom(topWidth, d->bottomHeight);
bottom.fill(Qt::transparent);
@ -304,25 +304,25 @@ void SvgPanel::paint(QPainter* painter, const QRectF& rect)
void SvgPanel::updateSizes()
{
d->background->resize();
if (d->bFlags & DrawTop) {
if (d->bFlags & DrawTopBorder) {
d->topHeight = d->background->elementSize("top").height();
} else {
d->topHeight = 0;
}
if (d->bFlags & DrawLeft) {
if (d->bFlags & DrawLeftBorder) {
d->leftWidth = d->background->elementSize("left").width();
} else {
d->leftWidth = 0;
}
if (d->bFlags & DrawRight) {
if (d->bFlags & DrawRightBorder) {
d->rightWidth = d->background->elementSize("right").width();
} else {
d->rightWidth = 0;
}
if (d->bFlags & DrawBottom) {
if (d->bFlags & DrawBottomBorder) {
d->bottomHeight = d->background->elementSize("bottom").height();
} else {
d->bottomHeight = 0;

15
svgpanel.h
View File

@ -48,11 +48,13 @@ class PLASMA_EXPORT SvgPanel : public QObject
/**
* These flags represents what borders should be drawn
*/
enum BorderFlag { DrawTop = 1,
DrawBottom = 2,
DrawLeft = 4,
DrawRight = 8,
ContentAtOrigin = 16
enum BorderFlag { DrawTopBorder = 1,
DrawBottomBorder = 2,
DrawLeftBorder = 4,
DrawRightBorder = 8,
ContentAtOrigin = 16,
DrawAllBorders = DrawTopBorder | DrawBottomBorder |
DrawLeftBorder | DrawRightBorder
};
Q_DECLARE_FLAGS(BorderFlags, BorderFlag)
@ -125,4 +127,7 @@ class PLASMA_EXPORT SvgPanel : public QObject
};
} // Plasma namespace
Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::SvgPanel::BorderFlags)
#endif // multiple inclusion guard