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

backport size hints fix

Browse Source 
svn path=/branches/KDE/4.4/kdelibs/; revision=1071053
This commit is contained in:
Marco Martin 2010-01-07 12:45:34 +00:00
parent d6dd4ae24a
commit 292ad2ee4a
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widgets/toolbutton.cpp
View File

@ -170,6 +170,11 @@ ToolButton::ToolButton(QGraphicsWidget *parent)
: QGraphicsProxyWidget(parent), : QGraphicsProxyWidget(parent),
d(new ToolButtonPrivate(this)) d(new ToolButtonPrivate(this))
{ {
d->background = new FrameSvg(this);
d->background->setImagePath("widgets/button");
d->background->setCacheAllRenderedFrames(true);
d->background->setElementPrefix("normal");
QToolButton *native = new QToolButton; QToolButton *native = new QToolButton;
connect(native, SIGNAL(clicked()), this, SIGNAL(clicked())); connect(native, SIGNAL(clicked()), this, SIGNAL(clicked()));
connect(native, SIGNAL(pressed()), this, SIGNAL(pressed())); connect(native, SIGNAL(pressed()), this, SIGNAL(pressed()));
@ -178,10 +183,6 @@ ToolButton::ToolButton(QGraphicsWidget *parent)
native->setAttribute(Qt::WA_NoSystemBackground); native->setAttribute(Qt::WA_NoSystemBackground);
native->setAutoRaise(true); native->setAutoRaise(true);
d->background = new FrameSvg(this);
d->background->setImagePath("widgets/button");
d->background->setCacheAllRenderedFrames(true);
d->background->setElementPrefix("normal");
d->syncBorders(); d->syncBorders();
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), SLOT(syncBorders())); connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), SLOT(syncBorders()));
@ -215,6 +216,7 @@ bool ToolButton::autoRaise() const
void ToolButton::setText(const QString &text) void ToolButton::setText(const QString &text)
{ {
static_cast<QToolButton*>(widget())->setText(text); static_cast<QToolButton*>(widget())->setText(text);
updateGeometry();
} }
QString ToolButton::text() const QString ToolButton::text() const
@ -430,6 +432,20 @@ void ToolButton::changeEvent(QEvent *event)
QGraphicsProxyWidget::changeEvent(event); QGraphicsProxyWidget::changeEvent(event);
} }
QSizeF ToolButton::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{
QSizeF hint = QGraphicsProxyWidget::sizeHint(which, constraint);
//replace the native margin with the Svg one
QStyleOption option;
option.initFrom(nativeWidget());
int nativeMargin = nativeWidget()->style()->pixelMetric(QStyle::PM_ButtonMargin, &option, nativeWidget());
qreal left, top, right, bottom;
d->background->getMargins(left, top, right, bottom);
hint = hint - QSize(nativeMargin, nativeMargin) + QSize(left+right, top+bottom);
return hint;
}
} // namespace Plasma } // namespace Plasma
#include <toolbutton.moc> #include <toolbutton.moc>

1
widgets/toolbutton.h
View File

@ -172,6 +172,7 @@ protected:
void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void changeEvent(QEvent *event); void changeEvent(QEvent *event);
QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
private: private:
Q_PRIVATE_SLOT(d, void syncBorders()) Q_PRIVATE_SLOT(d, void syncBorders())