the update of the dragger appearance belongs in themeChanged()
svn path=/trunk/KDE/kdelibs/; revision=1185176
This commit is contained in:
parent
22db020315
commit
c79712f294
@ -828,15 +828,6 @@ void ExtenderItemPrivate::updateToolBox()
|
|||||||
Q_ASSERT(toolbox);
|
Q_ASSERT(toolbox);
|
||||||
Q_ASSERT(toolboxLayout);
|
Q_ASSERT(toolboxLayout);
|
||||||
|
|
||||||
if (group) {
|
|
||||||
toolbox->setBackgroundPrefix("grouped");
|
|
||||||
} else {
|
|
||||||
if (extender->appearance() != Extender::NoBorders) {
|
|
||||||
toolbox->setBackgroundPrefix("root");
|
|
||||||
} else {
|
|
||||||
toolbox->setBackgroundPrefix(QString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
QAction *closeAction = actions.value("close");
|
QAction *closeAction = actions.value("close");
|
||||||
QAction *returnToSourceAction = actions.value("extenderItemReturnToSource");
|
QAction *returnToSourceAction = actions.value("extenderItemReturnToSource");
|
||||||
@ -1008,6 +999,16 @@ void ExtenderItemPrivate::themeChanged()
|
|||||||
background->getMargins(left, top, right, bottom);
|
background->getMargins(left, top, right, bottom);
|
||||||
layout->setContentsMargins(left, top, right, bottom);
|
layout->setContentsMargins(left, top, right, bottom);
|
||||||
|
|
||||||
|
if (group) {
|
||||||
|
toolbox->setBackgroundPrefix("grouped");
|
||||||
|
} else {
|
||||||
|
if (extender->items().count() <= 1 || extender->items().first() == q || extender->appearance() != Extender::NoBorders) {
|
||||||
|
toolbox->setBackgroundPrefix("root");
|
||||||
|
} else {
|
||||||
|
toolbox->setBackgroundPrefix(QString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
toolbox->updateTheme();
|
toolbox->updateTheme();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user