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

support for text beside icons depending of the layout direction, can be set with

Browse Source 
void setOrientation(Qt::Orientation orientation);

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=753744
This commit is contained in:
Marco Martin 2007-12-28 11:29:56 +00:00
parent cef9b8c77a
commit 1743b3d9ef
3 changed files with 111 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
widgets/icon.cpp
View File

@ -62,8 +62,7 @@ Icon::Private::Private()
svgElements(0),
iconSize(48, 48),
states(Private::NoState),
orientation(Qt::Vertical),
alignment(Qt::AlignHCenter | Qt::AlignTop)
orientation(Qt::Vertical)
{
svg.setContentType(Plasma::Svg::ImageSet);
@ -435,8 +434,9 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
d->setActiveMargins();
//calculate icon size based on the available space
//TODO: similar calculations for horizontal icons
qreal iconWidth;
if (d->orientation == Qt::Vertical) {
qreal heightAvail;
//if there is text resize the icon in order to make room for the text
if (!d->text.isEmpty() || !d->infoText.isEmpty()) {
@ -447,11 +447,11 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
//never make a label higher than half the total height
heightAvail = qMax(heightAvail, currentSize.height()/2);
}else{
heightAvail = size().height();
heightAvail = currentSize.height();
}
//aspect ratio very "tall"
if (size().width() < heightAvail) {
if (currentSize.width() < heightAvail) {
iconWidth = currentSize.width() -
d->horizontalMargin[Private::IconMargin].left -
d->horizontalMargin[Private::IconMargin].right;
@ -460,6 +460,41 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
d->verticalMargin[Private::IconMargin].top -
d->verticalMargin[Private::IconMargin].bottom;
}
//Horizontal layout
}else{
qreal widthAvail;
QFontMetricsF fm(font());
//make room for at most 14 characters
qreal textWidth = qMax(fm.width(d->text.left(12)),
fm.width(d->infoText.left(12))) +
fm.width("xx") +
d->horizontalMargin[Private::TextMargin].left +
d->horizontalMargin[Private::TextMargin].right;
//if there is text resize the icon in order to make room for the text
if (!d->text.isEmpty() || !d->infoText.isEmpty()) {
widthAvail = currentSize.width() -
//FIXME: fontmetrics
textWidth -
d->horizontalMargin[Private::TextMargin].left -
d->horizontalMargin[Private::TextMargin].right;
}else{
widthAvail = currentSize.width();
}
//aspect ratio very "wide"
if (currentSize.height() < widthAvail) {
iconWidth = currentSize.height() -
d->verticalMargin[Private::IconMargin].top -
d->verticalMargin[Private::IconMargin].bottom;
}else{
iconWidth = widthAvail -
d->horizontalMargin[Private::IconMargin].left -
d->horizontalMargin[Private::IconMargin].right;
}
}
d->iconSize = QSizeF(iconWidth, iconWidth);
int count = 0;
@ -598,6 +633,18 @@ QPointF Icon::Private::iconPosition(const QStyleOptionGraphicsItem *option, cons
// Compute the nominal decoration rectangle
const QSizeF size = addMargin(iconSize, Private::IconMargin);
//alignment depends from orientation and option->direction
Qt::Alignment alignment;
if (text.isEmpty() && infoText.isEmpty()) {
alignment = Qt::AlignCenter;
}else if (orientation == Qt::Vertical) {
alignment = Qt::Alignment(Qt::AlignHCenter | Qt::AlignTop);
//Horizontal
}else{
alignment = QStyle::visualAlignment(option->direction, Qt::Alignment(Qt::AlignLeft | Qt::AlignVCenter));
}
const QRect iconRect = QStyle::alignedRect(option->direction, alignment, size.toSize(), itemRect.toRect());
// Position the pixmap in the center of the rectangle
@ -624,8 +671,16 @@ QRectF Icon::Private::labelRectangle(const QStyleOptionGraphicsItem *option, con
const QRectF itemRect = subtractMargin(option->rect, Private::ItemMargin);
QRectF textArea(QPointF(0, 0), itemRect.size());
if (orientation == Qt::Vertical) {
textArea.setTop(decoSize.height() + 1);
//Horizontal
}else{
textArea.setLeft(decoSize.width() + 1);
}
textArea.translate(itemRect.topLeft());
return QRectF(QStyle::visualRect(option->direction, option->rect, textArea.toRect()));
}
@ -1058,9 +1113,9 @@ void Icon::setUnpressed()
setPressed(false);
}
void Icon::setAlignment(Qt::Alignment alignment)
void Icon::setOrientation(Qt::Orientation orientation)
{
d->alignment=alignment;
d->orientation = orientation;
}
QSizeF Icon::sizeFromIconSize(const qreal iconWidth) const
@ -1080,7 +1135,12 @@ QSizeF Icon::sizeFromIconSize(const qreal iconWidth) const
d->horizontalMargin[Private::TextMargin].left +
d->horizontalMargin[Private::TextMargin].right;
width = qMax(width, iconWidth);
if (d->orientation == Qt::Vertical) {
width = qMax(width,
iconWidth +
d->horizontalMargin[Private::IconMargin].left +
d->horizontalMargin[Private::IconMargin].right);
}
qreal height;
qreal textHeight;
@ -1090,11 +1150,24 @@ QSizeF Icon::sizeFromIconSize(const qreal iconWidth) const
option.rect = boundingRect().toRect();
textHeight = d->displaySizeHint(&option, width).height();
if (d->orientation == Qt::Vertical) {
height = iconWidth + textHeight +
d->verticalMargin[Private::TextMargin].top +
d->verticalMargin[Private::TextMargin].bottom +
d->verticalMargin[Private::IconMargin].top +
d->verticalMargin[Private::IconMargin].bottom;
//Horizontal
}else{
height = qMax(iconWidth +
d->verticalMargin[Private::IconMargin].top +
d->verticalMargin[Private::IconMargin].bottom,
textHeight +
d->verticalMargin[Private::TextMargin].top +
d->verticalMargin[Private::IconMargin].bottom);
width = width + iconWidth +
d->horizontalMargin[Private::IconMargin].left +
d->horizontalMargin[Private::IconMargin].right;
}
return d->addMargin(QSizeF(width, height), Private::ItemMargin);
}

9
widgets/icon.h
View File

@ -143,10 +143,13 @@ public:
void addAction(QAction* action);
/**
* let set the position in layout area
* @param alignment the alignment we want
* let set the orientation of the icon
* Qt::Vertical: text under the icon
* Qt::Horizontal text at a side of the icon depending
* by the direction of the language
* @param orientation the orientation we want
*/
void setAlignment(Qt::Alignment alignment);
void setOrientation(Qt::Orientation orientation);
/**
* @return optimal size given a size for the icon

1
widgets/icon_p.h
View File

@ -180,7 +180,6 @@ public:
QIcon icon;
IconStates states;
Qt::Orientation orientation;
Qt::Alignment alignment;
int numDisplayLines;
QList<IconAction*> cornerActions;