1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix window(child)geometry manual tests

Browse Source 
Task-number: QTBUG-67632
Change-Id: I16482d3501cc7c7893d6eac4617c77dc70e1e215
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-06-04 16:21:32 +02:00
parent f8944a7f07
commit 92b3ef24ed
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/manual/windowchildgeometry/controllerwidget.cpp
View File

@ -236,7 +236,7 @@ private:
WidgetWindowControl::WidgetWindowControl(QWidget *w ) WidgetWindowControl::WidgetWindowControl(QWidget *w )
: BaseWindowControl(w) : BaseWindowControl(w)
, m_statesControl(new WindowStatesControl(WindowStatesControl::WantVisibleCheckBox | WindowStatesControl::WantActiveCheckBox)) , m_statesControl(new WindowStatesControl)
{ {
setTitle(w->windowTitle()); setTitle(w->windowTitle());
m_layout->addWidget(m_statesControl, 2, 0); m_layout->addWidget(m_statesControl, 2, 0);
@ -364,14 +364,14 @@ private:
virtual void setObjectWindowFlags(QObject *o, Qt::WindowFlags f) virtual void setObjectWindowFlags(QObject *o, Qt::WindowFlags f)
{ static_cast<QWindow *>(o)->setFlags(f); } { static_cast<QWindow *>(o)->setFlags(f); }
WindowStateControl *m_stateControl; WindowStatesControl *m_statesControl;
QWindow *m_window; QWindow *m_window;
QWindow *m_detachedParent; // set when this window is detached. This is the window we should re-attach to. QWindow *m_detachedParent; // set when this window is detached. This is the window we should re-attach to.
}; };
WindowControl::WindowControl(QWindow *w ) WindowControl::WindowControl(QWindow *w )
: BaseWindowControl(w) : BaseWindowControl(w)
, m_stateControl(new WindowStateControl(WindowStateControl::WantVisibleCheckBox | WindowStateControl::WantMinimizeRadioButton)) , m_statesControl(new WindowStatesControl)
, m_window(w) , m_window(w)
, m_detachedParent(0) , m_detachedParent(0)
{ {

18
tests/manual/windowgeometry/controllerwidget.cpp
View File

@ -256,7 +256,7 @@ private:
WidgetWindowControl::WidgetWindowControl(QWidget *w ) WidgetWindowControl::WidgetWindowControl(QWidget *w )
: BaseWindowControl(w) : BaseWindowControl(w)
, m_statesControl(new WindowStatesControl(WindowStatesControl::WantVisibleCheckBox | WindowStatesControl::WantActiveCheckBox)) , m_statesControl(new WindowStatesControl)
{ {
setTitle(w->windowTitle()); setTitle(w->windowTitle());
m_layout->addWidget(m_statesControl, 2, 0); m_layout->addWidget(m_statesControl, 2, 0);
@ -354,34 +354,34 @@ private:
virtual void setObjectWindowFlags(QObject *o, Qt::WindowFlags f) virtual void setObjectWindowFlags(QObject *o, Qt::WindowFlags f)
{ static_cast<QWindow *>(o)->setFlags(f); } { static_cast<QWindow *>(o)->setFlags(f); }
WindowStateControl *m_stateControl; WindowStatesControl *m_statesControl;
}; };
WindowControl::WindowControl(QWindow *w ) WindowControl::WindowControl(QWindow *w )
: BaseWindowControl(w) : BaseWindowControl(w)
, m_stateControl(new WindowStateControl(WindowStateControl::WantVisibleCheckBox | WindowStateControl::WantMinimizeRadioButton)) , m_statesControl(new WindowStatesControl)
{ {
setTitle(w->title()); setTitle(w->title());
QGroupBox *stateGroupBox = new QGroupBox(tr("State")); QGroupBox *stateGroupBox = new QGroupBox(tr("State"));
QVBoxLayout *l = new QVBoxLayout(stateGroupBox); QVBoxLayout *l = new QVBoxLayout(stateGroupBox);
l->addWidget(m_stateControl); l->addWidget(m_statesControl);
m_layout->addWidget(stateGroupBox, 2, 0); m_layout->addWidget(stateGroupBox, 2, 0);
connect(m_stateControl, SIGNAL(changed()), this, SLOT(stateChanged())); connect(m_statesControl, SIGNAL(changed()), this, SLOT(stateChanged()));
} }
void WindowControl::refresh() void WindowControl::refresh()
{ {
const QWindow *w = static_cast<const QWindow *>(m_object); const QWindow *w = static_cast<const QWindow *>(m_object);
BaseWindowControl::refresh(); BaseWindowControl::refresh();
m_stateControl->setVisibleValue(w->isVisible()); m_statesControl->setVisibleValue(w->isVisible());
m_stateControl->setState(w->windowState()); m_statesControl->setStates(w->windowStates());
} }
void WindowControl::stateChanged() void WindowControl::stateChanged()
{ {
QWindow *w = static_cast<QWindow *>(m_object); QWindow *w = static_cast<QWindow *>(m_object);
w->setVisible(m_stateControl->visibleValue()); w->setVisible(m_statesControl->visibleValue());
w->setWindowState(m_stateControl->state()); w->setWindowStates(m_statesControl->states());
} }
#endif #endif