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

SVN_SILENT: random ws improvements made while debugging various issues

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=966511
This commit is contained in:
Aaron J. Seigo 2009-05-11 09:32:19 +00:00
parent efbba51e0a
commit ec65d08748
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applet.cpp
View File

@ -837,9 +837,7 @@ void Applet::setBackgroundHints(const BackgroundHints hints)
//position is in the boundaries overlaySize.width()*2, overlaySize.height()
qsrand(id());
d->background->d->overlayPos.rx() = - (overlaySize.width() /2) + (overlaySize.width() /4) * (qrand() % (4 + 1));
d->background->d->overlayPos.ry() = (- (overlaySize.height() /2) + (overlaySize.height() /4) * (qrand() % (4 + 1)))/2;
}

11
framesvg.cpp
View File

@ -561,16 +561,16 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
QSize overlaySize = q->elementSize(prefix+"overlay");
//Random pos, stretched and tiled are mutually exclusive
if (q->hasElement(prefix+"hint-overlay-random-pos")) {
if (q->hasElement(prefix + "hint-overlay-random-pos")) {
pos = overlayPos;
//Stretched or Tiled?
} else if (q->hasElement(prefix+"hint-overlay-stretch")) {
} else if (q->hasElement(prefix + "hint-overlay-stretch")) {
overlaySize = frame->frameSize;
} else {
if (q->hasElement(prefix+"hint-overlay-tile-horizontal")) {
if (q->hasElement(prefix + "hint-overlay-tile-horizontal")) {
overlaySize.setWidth(frame->frameSize.width());
}
if (q->hasElement(prefix+"hint-overlay-tile-vertical")) {
if (q->hasElement(prefix + "hint-overlay-tile-vertical")) {
overlaySize.setHeight(frame->frameSize.height());
}
}
@ -579,10 +579,8 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
arg(overlayPos.y()).arg(overlayPos.x()).arg(frame->enabledBorders).arg(frame->frameSize.width()).arg(frame->frameSize.height()).arg(prefix).arg(q->imagePath());
QPixmap overlay = q->alphaMask();
QPainter overlayPainter(&overlay);
overlayPainter.setCompositionMode(QPainter::CompositionMode_SourceIn);
//Tiling?
if (q->hasElement(prefix+"hint-overlay-tile-horizontal") ||
q->hasElement(prefix+"hint-overlay-tile-vertical")) {
@ -598,7 +596,6 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
overlayPainter.end();
p.setCompositionMode(QPainter::CompositionMode_SourceOver);
p.drawPixmap(overlayPos, overlay, QRect(overlayPos, overlaySize));
}

1
tooltipcontent.cpp
View File

@ -42,6 +42,7 @@ struct ToolTipResource
ToolTipContent::ResourceType type;
QVariant data;
};
class ToolTipContentPrivate
{
public: