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

Prefer passing a size rather than a width and height

Browse Source
This commit is contained in:
Aleix Pol 2014-07-14 16:37:00 +02:00
parent df1d44407a
commit f62b357b62
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/plasma/framesvg.cpp
View File

@ -895,28 +895,27 @@ void FrameSvgPrivate::generateFrameBackground(FrameData *frame)
// Sides // Sides
const int leftHeight = q->elementSize(prefix % "left").height(); const int leftHeight = q->elementSize(prefix % "left").height();
paintBorder(p, frame, FrameSvg::LeftBorder, frame->leftWidth, leftHeight, QRect(leftOffset, contentTop, frame->leftWidth, contentHeight)); paintBorder(p, frame, FrameSvg::LeftBorder, QSize(frame->leftWidth, leftHeight), QRect(leftOffset, contentTop, frame->leftWidth, contentHeight));
paintBorder(p, frame, FrameSvg::RightBorder, frame->rightWidth, leftHeight, QRect(rightOffset, contentTop, frame->rightWidth, contentHeight)); paintBorder(p, frame, FrameSvg::RightBorder, QSize(frame->rightWidth, leftHeight), QRect(rightOffset, contentTop, frame->rightWidth, contentHeight));
const int topWidth = q->elementSize(prefix % "top").width(); const int topWidth = q->elementSize(prefix % "top").width();
paintBorder(p, frame, FrameSvg::TopBorder, topWidth, frame->topHeight, QRect(contentLeft, topOffset, contentWidth, frame->topHeight)); paintBorder(p, frame, FrameSvg::TopBorder, QSize(topWidth, frame->topHeight), QRect(contentLeft, topOffset, contentWidth, frame->topHeight));
paintBorder(p, frame, FrameSvg::BottomBorder, topWidth, frame->bottomHeight, QRect(contentLeft, bottomOffset, contentWidth, frame->bottomHeight)); paintBorder(p, frame, FrameSvg::BottomBorder, QSize(topWidth, frame->bottomHeight), QRect(contentLeft, bottomOffset, contentWidth, frame->bottomHeight));
} }
void FrameSvgPrivate::paintBorder(QPainter& p, FrameData* frame, const FrameSvg::EnabledBorders borders, int length, int thickness, const QRect& output) const void FrameSvgPrivate::paintBorder(QPainter& p, FrameData* frame, const FrameSvg::EnabledBorders borders, const QSize& size, const QRect& output) const
{ {
QString side = borderToElementId(borders); QString side = prefix % borderToElementId(borders);
if (frame->enabledBorders & borders && q->hasElement(prefix % side) && length > 0 && thickness > 0) { if (frame->enabledBorders & borders && q->hasElement(side) && !size.isEmpty()) {
if (frame->stretchBorders) { if (frame->stretchBorders) {
q->paint(&p, output, prefix % side); q->paint(&p, output, side);
} else { } else {
QPixmap px(length, thickness); QPixmap px(size);
px.fill(Qt::transparent); px.fill(Qt::transparent);
QPainter sidePainter(&px); QPainter sidePainter(&px);
sidePainter.setCompositionMode(QPainter::CompositionMode_Source); sidePainter.setCompositionMode(QPainter::CompositionMode_Source);
q->paint(&sidePainter, QRect(QPoint(0, 0), px.size()), prefix % side); q->paint(&sidePainter, QRect(QPoint(0, 0), size), side);
p.drawTiledPixmap(output, px); p.drawTiledPixmap(output, px);
} }

2
src/plasma/private/framesvg_p.h
View File

@ -148,7 +148,7 @@ public:
void updateNeeded(); void updateNeeded();
void updateAndSignalSizes(); void updateAndSignalSizes();
QSizeF frameSize(FrameData *frame) const; QSizeF frameSize(FrameData *frame) const;
void paintBorder(QPainter& p, FrameData* frame, Plasma::FrameSvg::EnabledBorders border, int length, int thickness, const QRect& output) const; void paintBorder(QPainter& p, FrameData* frame, Plasma::FrameSvg::EnabledBorders border, const QSize& originalSize, const QRect& output) const;
static QString borderToElementId(Plasma::FrameSvg::EnabledBorders borders); static QString borderToElementId(Plasma::FrameSvg::EnabledBorders borders);
Types::Location location; Types::Location location;