From c0231730e2990873cf95e79e5c692af97ab2d072 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 26 Oct 2007 01:11:27 +0000 Subject: [PATCH] * a more sane init(), by using the default values set in the Private class (or by prior calls to set*()?) * try to give this a hope in hell of working in xinerama; include some debug output for when it fails ;) svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=729449 --- containment.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/containment.cpp b/containment.cpp index aebda7ecb..f505b3b14 100644 --- a/containment.cpp +++ b/containment.cpp @@ -128,10 +128,10 @@ void Containment::init() void Containment::initConstraints(KConfigGroup* group) { //kDebug() << "initConstraints" << group->name() << type(); - setLocation((Plasma::Location)group->readEntry("location", (int)Plasma::Desktop)); - setGeometry(group->readEntry("geometry", QRectF())); - setFormFactor((Plasma::FormFactor)group->readEntry("formfactor", (int)Plasma::Planar)); - setScreen(group->readEntry("screen", 0)); + setLocation((Plasma::Location)group->readEntry("location", (int)d->location)); + setGeometry(group->readEntry("geometry", geometry())); + setFormFactor((Plasma::FormFactor)group->readEntry("formfactor", (int)d->formFactor)); + setScreen(group->readEntry("screen", d->screen)); } void Containment::saveConstraints(KConfigGroup* group) const @@ -476,13 +476,13 @@ void Containment::setScreen(int screen) QRect r = desktop.screenGeometry(screen); if (type() == DesktopContainment) { - r.moveRight(INTER_CONTAINMENT_MARGIN * screen); + r.moveLeft(INTER_CONTAINMENT_MARGIN * screen); setGeometry(r); //kDebug() << "setting geometry to" << desktop.screenGeometry(screen) << geometry(); } else if (type() == PanelContainment) { QDesktopWidget desktop; QRect r = desktop.screenGeometry(screen); - kDebug() << "APAKU: we are a panel, let's move ourselves to a negative coordinate system" << r; + kDebug() << "APAKU: we are a panel on" << r << ", let's move ourselves to a negative coordinate system" << -r.height() - INTER_CONTAINMENT_MARGIN; //FIXME PANELS: multiple panel support means having to move the panels up // this requires a proper panel manager, discuss in the panel // irc meeting