correct some last toolbox annoyances...

svn path=/trunk/KDE/kdelibs/; revision=893011
This commit is contained in:
Marco Martin 2008-12-05 18:16:30 +00:00
parent 5acc95a83b
commit 98b833977b
2 changed files with 6 additions and 3 deletions

View File

@ -834,8 +834,8 @@ void Containment::setScreen(int screen, int desktop)
if (immutability() == Mutable) {
enableAction("remove", screen == -1 ||
containmentType() != Plasma::Containment::PanelContainment ||
containmentType() != Plasma::Containment::CustomPanelContainment);
containmentType() == Plasma::Containment::PanelContainment ||
containmentType() == Plasma::Containment::CustomPanelContainment);
}
}

View File

@ -314,13 +314,16 @@ QTransform ToolBox::viewTransform() const
void ToolBox::setViewTransform(QTransform transform)
{
d->viewTransform = transform;
if (transform.isScaling()) {
d->toolbar = true;
showToolBox();
} else {
d->toolbar = false;
if (d->viewTransform != transform) {
hideToolBox();
}
}
d->viewTransform = transform;
}
void ToolBox::save(KConfigGroup &cg) const