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

correctly position new activity when adding one

Browse Source 
never show text on wider zoom level

svn path=/trunk/KDE/kdelibs/; revision=891258
This commit is contained in:
Marco Martin 2008-12-01 13:17:27 +00:00
parent d9c14c87ba
commit 9fd8a3298d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
containment.cpp
View File

@ -1745,9 +1745,6 @@ void ContainmentPrivate::positionContainments()
it.toFront();
int toolBoxMargin = 0;
if (toolBox) {
toolBoxMargin = TOOLBOX_MARGIN;
}
int column = 0;
int x = 0;
@ -1761,6 +1758,12 @@ void ContainmentPrivate::positionContainments()
containment->setPos(x, y);
//kDebug() << ++count << "setting to" << x << y;
if (containment->toolBoxItem()) {
toolBoxMargin = TOOLBOX_MARGIN;
} else {
toolBoxMargin = 0;
}
int height = containment->size().height();
if (height > rowHeight) {
rowHeight = height;

7
private/desktoptoolbox.cpp
View File

@ -422,9 +422,10 @@ void DesktopToolBox::showToolBox()
Plasma::IconWidget *icon = qgraphicsitem_cast<Plasma::IconWidget *>(tool);
if (icon) {
if (d->viewTransform.m11() == Plasma::scalingFactor(Plasma::DesktopZoom) ||
icon->action() == d->containment->action("add sibling containment") ||
icon->action() == d->containment->action("add widgets")) {
if (d->viewTransform.m11() != Plasma::scalingFactor(Plasma::OverviewZoom) &&
(d->viewTransform.m11() == Plasma::scalingFactor(Plasma::DesktopZoom) ||
icon->action() == d->containment->action("add sibling containment") ||
icon->action() == d->containment->action("add widgets"))) {
icon->setText(icon->action()->text());
icon->resize(icon->sizeFromIconSize(22));
} else {