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

various fixes for xinerama and non-isContainment() containments (e.g. applets which are Containment subclasses)

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=786175
This commit is contained in:
Aaron J. Seigo 2008-03-16 07:20:42 +00:00
parent 9c638f076d
commit 863e0f7797
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
containment.cpp
View File

@ -214,6 +214,10 @@ void Containment::saveConstraints(KConfigGroup* group) const
void Containment::containmentConstraintsUpdated(Plasma::Constraints constraints)
{
if (!isContainment()) {
return;
}
//kDebug() << "got containmentConstraintsUpdated" << constraints << (QObject*)d->toolbox;
if (constraints & Plasma::ImmutableConstraint) {
d->setLockToolText();
@ -417,7 +421,7 @@ void Containment::setFormFactor(FormFactor formFactor)
d->formFactor = formFactor;
if (containmentType() == PanelContainment && was != formFactor) {
if (isContainment() && containmentType() == PanelContainment && was != formFactor) {
// we are a panel and we have chaged our orientation
positionPanel(true);
}
@ -834,7 +838,9 @@ void Containment::setScreen(int screen)
int oldScreen = d->screen;
d->screen = screen;
updateConstraints(Plasma::ScreenConstraint);
emit screenChanged(oldScreen, screen, this);
if (oldScreen != screen) {
emit screenChanged(oldScreen, screen, this);
}
}
void Containment::positionContainment()
@ -849,9 +855,10 @@ void Containment::positionContainment()
while (it.hasNext()) {
Containment *containment = it.next();
if (containment->containmentType() == PanelContainment) {
if (containment == this ||
containment->containmentType() == PanelContainment) {
// weed out all containments we don't care about at all
// e.g. Panels
// e.g. Panels and ourself
it.remove();
continue;
}
@ -1197,7 +1204,8 @@ QVariant Containment::itemChange(GraphicsItemChange change, const QVariant &valu
{
Q_UNUSED(value)
if ((change == QGraphicsItem::ItemSceneHasChanged || change == QGraphicsItem::ItemPositionHasChanged) &&
if (isContainment() &&
(change == QGraphicsItem::ItemSceneHasChanged || change == QGraphicsItem::ItemPositionHasChanged) &&
!d->positioning) {
switch (containmentType()) {
case PanelContainment:

4
corona.cpp
View File

@ -357,8 +357,8 @@ Containment* Corona::containmentForScreen(int screen) const
{
foreach (Containment* containment, d->containments) {
if (containment->screen() == screen &&
containment->containmentType() == Containment::DesktopContainment ||
containment->containmentType() == Containment::CustomContainment) {
(containment->containmentType() == Containment::DesktopContainment ||
containment->containmentType() == Containment::CustomContainment)) {
return containment;
}
}