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

instead of announcing new screens and not announcing new containments, announce new containments as well as screen affinity changes and let the host app worry about what to do from there

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=784941
This commit is contained in:
Aaron J. Seigo 2008-03-12 20:41:03 +00:00
parent 6dc52aaa65
commit eb0bf064ab
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containment.cpp
View File

@ -834,8 +834,10 @@ void Containment::setScreen(int screen)
}
}
int oldScreen = d->screen;
d->screen = screen;
updateConstraints(Plasma::ScreenConstraint);
emit screenChanged(oldScreen, screen, this);
}
void Containment::positionPanel(bool force)

10
containment.h
View File

@ -314,6 +314,16 @@ class PLASMA_EXPORT Containment : public Applet
*/
void showAddWidgets();
/**
* This signal indicates that a containment has been newly
* associated (or dissociated) with a physical screen.
*
* @param wasScreen the screen it was associated with
* @param isScreen the screen it is now associated with
* @param containment the containment switching screens
*/
void screenChanged(int wasScreen, int isScreen, Plasma::Containment *containment);
public Q_SLOTS:
/**
* Informs the Corona as to what position it is in. This is informational

8
corona.cpp
View File

@ -280,6 +280,7 @@ void Corona::loadApplets(const QString& configName)
containment->updateConstraints(Plasma::StartupCompletedConstraint);
containment->flushUpdatedConstraints();
emit containmentAdded(containment);
}
// quick sanity check to ensure we have containments for each screen!
@ -438,6 +439,12 @@ Containment* Corona::addContainment(const QString& name, const QVariantList& arg
SIGNAL(launchActivated()));
connect(containment, SIGNAL(configNeedsSaving()),
SLOT(scheduleConfigSync()));
connect(containment, SIGNAL(screenChanged(int,int,Plasma::Containment*)),
this, SIGNAL(screenOwnerChanged(int,int,Plasma::Containment*)));
if (!delayedInit) {
emit containmentAdded(containment);
}
return containment;
}
@ -525,7 +532,6 @@ void Corona::screenResized(int screen)
Containment* c = addContainment("desktop");
c->setScreen(screen);
c->setFormFactor(Plasma::Planar);
emit newScreen(screen);
}
void Corona::syncConfig()

18
corona.h
View File

@ -157,12 +157,20 @@ Q_SIGNALS:
void launchActivated();
/**
* This signal indicates that a new screen is being handled
* at runtime (e.g. after first creation)
*
* @param screen the xinerama number of the new screen
* This signal indicates a new containment has been added to
* the Corona
*/
void newScreen(int screen);
void containmentAdded(Plasma::Containment *containment);
/**
* This signal indicates that a containment has been newly
* associated (or dissociated) with a physical screen.
*
* @param wasScreen the screen it was associated with
* @param isScreen the screen it is now associated with
* @param containment the containment switching screens
*/
void screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment *containment);
protected:
void dragEnterEvent(QGraphicsSceneDragDropEvent* event);