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

correct some last toolbox annoyances...

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containment.cpp
View File

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

5
private/toolbox.cpp
View File

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