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

toggle the popup when activated

Browse Source 
CCBUG:222418

svn path=/branches/KDE/4.4/kdelibs/; revision=1073722
This commit is contained in:
Aaron J. Seigo 2010-01-12 18:36:10 +00:00
parent 05adc83780
commit 5f6fd5e387
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
popupapplet.cpp
View File

@ -59,7 +59,7 @@ PopupApplet::PopupApplet(QObject *parent, const QVariantList &args)
int iconSize = IconSize(KIconLoader::Desktop); int iconSize = IconSize(KIconLoader::Desktop);
resize(iconSize, iconSize); resize(iconSize, iconSize);
disconnect(this, SIGNAL(activate()), (Applet*)this, SLOT(setFocus())); disconnect(this, SIGNAL(activate()), (Applet*)this, SLOT(setFocus()));
connect(this, SIGNAL(activate()), this, SLOT(showPopup())); connect(this, SIGNAL(activate()), this, SLOT(togglePopup()));
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -70,7 +70,7 @@ PopupApplet::PopupApplet(const QString &packagePath, uint appletId, const QVaria
int iconSize = IconSize(KIconLoader::Desktop); int iconSize = IconSize(KIconLoader::Desktop);
resize(iconSize, iconSize); resize(iconSize, iconSize);
disconnect(this, SIGNAL(activate()), (Applet*)this, SLOT(setFocus())); disconnect(this, SIGNAL(activate()), (Applet*)this, SLOT(setFocus()));
connect(this, SIGNAL(activate()), this, SLOT(showPopup())); connect(this, SIGNAL(activate()), this, SLOT(togglePopup()));
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -512,10 +512,6 @@ void PopupApplet::showPopup(uint popupDuration)
d->internalTogglePopup(); d->internalTogglePopup();
} }
if (d->timer) {
d->timer->stop();
}
if (popupDuration > 0) { if (popupDuration > 0) {
if (!d->timer) { if (!d->timer) {
d->timer = new QTimer(this); d->timer = new QTimer(this);
@ -593,8 +589,12 @@ PopupAppletPrivate::~PopupAppletPrivate()
void PopupAppletPrivate::internalTogglePopup() void PopupAppletPrivate::internalTogglePopup()
{ {
Plasma::Dialog *d = dialogPtr.data(); if (timer) {
if (!d) { timer->stop();
}
Plasma::Dialog *dialog = dialogPtr.data();
if (!dialog) {
q->setFocus(Qt::ShortcutFocusReason); q->setFocus(Qt::ShortcutFocusReason);
return; return;
} }
@ -607,14 +607,14 @@ void PopupAppletPrivate::internalTogglePopup()
timer->stop(); timer->stop();
} }
if (d->isVisible()) { if (dialog->isVisible()) {
if (q->location() != Floating) { if (q->location() != Floating) {
d->animatedHide(locationToInverseDirection(q->location())); dialog->animatedHide(locationToInverseDirection(q->location()));
} else { } else {
d->hide(); dialog->hide();
} }
d->clearFocus(); dialog->clearFocus();
} else { } else {
if (q->graphicsWidget() && if (q->graphicsWidget() &&
q->graphicsWidget() == static_cast<Applet*>(q)->d->extender.data() && q->graphicsWidget() == static_cast<Applet*>(q)->d->extender.data() &&
@ -626,19 +626,19 @@ void PopupAppletPrivate::internalTogglePopup()
ToolTipManager::self()->hide(q); ToolTipManager::self()->hide(q);
updateDialogPosition(); updateDialogPosition();
KWindowSystem::setOnAllDesktops(d->winId(), true); KWindowSystem::setOnAllDesktops(dialog->winId(), true);
KWindowSystem::setState(d->winId(), NET::SkipTaskbar | NET::SkipPager); KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
d->setAspectRatioMode(savedAspectRatio); dialog->setAspectRatioMode(savedAspectRatio);
if (q->location() != Floating) { if (q->location() != Floating) {
d->animatedShow(locationToDirection(q->location())); dialog->animatedShow(locationToDirection(q->location()));
} else { } else {
d->show(); dialog->show();
} }
if (!(d->windowFlags() & Qt::X11BypassWindowManagerHint)) { if (!(dialog->windowFlags() & Qt::X11BypassWindowManagerHint)) {
KWindowSystem::activateWindow(d->winId()); KWindowSystem::activateWindow(dialog->winId());
} }
} }
} }