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

restore isactivewindow

Browse Source
This commit is contained in:
Marco Martin 2013-02-20 19:39:03 +01:00
parent 7ce2d0f7d6
commit a1507092a0
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/declarativeimports/core/dialog.cpp
View File

@ -36,8 +36,6 @@
//#include <Plasma/WindowEffects> //#include <Plasma/WindowEffects>
#include <QDebug> #include <QDebug>
int DialogProxy::offscreenX = 0;
int DialogProxy::offscreenY = 0;
DialogMargins::DialogMargins(QQuickWindow *dialog, QObject *parent) DialogMargins::DialogMargins(QQuickWindow *dialog, QObject *parent)
: QObject(parent), : QObject(parent),
@ -175,10 +173,9 @@ bool DialogProxy::isVisible() const
void DialogProxy::setVisible(const bool visible) void DialogProxy::setVisible(const bool visible)
{ {
if (isVisible() != visible) { if (visible) {
syncToMainItemSize(); syncToMainItemSize();
const QRect workArea(KWindowSystem::workArea()); const QRect workArea(KWindowSystem::workArea());
if (!workArea.contains(geometry())) { if (!workArea.contains(geometry())) {
setPosition(qBound(workArea.left(), x(), workArea.right() - width()), setPosition(qBound(workArea.left(), x(), workArea.right() - width()),
@ -186,11 +183,9 @@ void DialogProxy::setVisible(const bool visible)
); );
} }
QQuickWindow::setVisible(visible);
if (visible) {
raise(); raise();
} }
} QQuickWindow::setVisible(visible);
} }
QPoint DialogProxy::popupPosition(QQuickItem *item, int alignment) QPoint DialogProxy::popupPosition(QQuickItem *item, int alignment)
@ -424,5 +419,19 @@ void DialogProxy::setAttribute(int attribute, bool on)
} }
} }
void DialogProxy::focusInEvent(QFocusEvent *ev)
{
Q_UNUSED(ev)
m_activeWindow = true;
emit activeWindowChanged();
}
void DialogProxy::focusOutEvent(QFocusEvent *ev)
{
Q_UNUSED(ev)
m_activeWindow = false;
emit activeWindowChanged();
}
#include "moc_dialog.cpp" #include "moc_dialog.cpp"

9
src/declarativeimports/core/dialog.h
View File

@ -190,10 +190,6 @@ public:
Q_SIGNALS: Q_SIGNALS:
void mainItemChanged(); void mainItemChanged();
void visibleChanged(); void visibleChanged();
// void xChanged();
// void yChanged();
// void widthChanged();
// void heightChanged();
void activeWindowChanged(); void activeWindowChanged();
void locationChanged(); void locationChanged();
@ -203,17 +199,16 @@ private Q_SLOTS:
protected: protected:
// bool eventFilter(QObject *watched, QEvent *event); // bool eventFilter(QObject *watched, QEvent *event);
void resizeEvent(QResizeEvent *re); void resizeEvent(QResizeEvent *re);
void focusInEvent(QFocusEvent *ev);
void focusOutEvent(QFocusEvent *ev);
private: private:
Qt::WindowFlags m_flags; Qt::WindowFlags m_flags;
QQuickItem *m_declarativeItemContainer;
QTimer *m_syncTimer; QTimer *m_syncTimer;
QWeakPointer<QQuickItem> m_mainItem; QWeakPointer<QQuickItem> m_mainItem;
DialogMargins *m_margins; DialogMargins *m_margins;
bool m_activeWindow; bool m_activeWindow;
Plasma::Location m_location; Plasma::Location m_location;
static int offscreenX;
static int offscreenY;
}; };
#endif #endif