Make showPopup a slot to be consistent with hidePopup and add a togglepopup slot just for convenience.
svn path=/trunk/KDE/kdelibs/; revision=885723
This commit is contained in:
parent
f8a342f0f5
commit
6ce288cc0e
@ -350,6 +350,13 @@ void PopupApplet::hidePopup()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PopupApplet::togglePopup()
|
||||||
|
{
|
||||||
|
if (d->dialog && (formFactor() == Horizontal || formFactor() == Vertical)) {
|
||||||
|
d->dialog->setVisible(!d->dialog->isVisible());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Plasma::PopupPlacement PopupApplet::popupPlacement() const
|
Plasma::PopupPlacement PopupApplet::popupPlacement() const
|
||||||
{
|
{
|
||||||
return d->popupPlacement;
|
return d->popupPlacement;
|
||||||
@ -417,7 +424,7 @@ void PopupAppletPrivate::dialogSizeChanged()
|
|||||||
{
|
{
|
||||||
//Reposition the dialog
|
//Reposition the dialog
|
||||||
if (dialog) {
|
if (dialog) {
|
||||||
dialog->updateGeometry();
|
//dialog->updateGeometry();
|
||||||
dialog->move(q->popupPosition(dialog->size()));
|
dialog->move(q->popupPosition(dialog->size()));
|
||||||
|
|
||||||
KConfigGroup sizeGroup = q->config();
|
KConfigGroup sizeGroup = q->config();
|
||||||
|
@ -82,13 +82,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual QGraphicsWidget *graphicsWidget();
|
virtual QGraphicsWidget *graphicsWidget();
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows the dialog showing the widget if the applet is in a panel.
|
|
||||||
* @arg displayTime the time in ms that the popup should be displayed, defaults to 0 which means
|
|
||||||
* always (until the user closes it again, that is).
|
|
||||||
*/
|
|
||||||
void showPopup(uint displayTime = 0);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the placement of the popup relating to the icon
|
* @return the placement of the popup relating to the icon
|
||||||
*/
|
*/
|
||||||
@ -109,6 +102,18 @@ public Q_SLOTS:
|
|||||||
*/
|
*/
|
||||||
void hidePopup();
|
void hidePopup();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shows the dialog showing the widget if the applet is in a panel.
|
||||||
|
* @arg displayTime the time in ms that the popup should be displayed, defaults to 0 which means
|
||||||
|
* always (until the user closes it again, that is).
|
||||||
|
*/
|
||||||
|
void showPopup(uint displayTime = 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggles the popup.
|
||||||
|
*/
|
||||||
|
void togglePopup();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void mousePressEvent(QGraphicsSceneMouseEvent *event);
|
void mousePressEvent(QGraphicsSceneMouseEvent *event);
|
||||||
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
|
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
|
||||||
|
Loading…
Reference in New Issue
Block a user