Added View::focusPolicy()
This commit is contained in:
@@ -121,6 +121,7 @@ public:
|
||||
return minSize().height();
|
||||
}
|
||||
|
||||
virtual Qt::FocusPolicy focusPolicy() const = 0;
|
||||
virtual QSize maxSizeHint() const = 0;
|
||||
virtual QSize maximumSize() const = 0;
|
||||
virtual QRect geometry() const = 0;
|
||||
|
||||
@@ -201,6 +201,16 @@ void ViewWrapper_qtquick::releaseMouse()
|
||||
m_item->ungrabMouse();
|
||||
}
|
||||
|
||||
Qt::FocusPolicy ViewWrapper_qtquick::focusPolicy() const
|
||||
{
|
||||
if (auto view = unwrap()) {
|
||||
return view->focusPolicy();
|
||||
} else {
|
||||
qFatal("not implemented");
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
void ViewWrapper_qtquick::setFocus(Qt::FocusReason)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -61,6 +61,7 @@ public:
|
||||
void setCursor(Qt::CursorShape) override;
|
||||
QSize minSize() const override;
|
||||
bool close() override;
|
||||
Qt::FocusPolicy focusPolicy() const override;
|
||||
|
||||
const View *unwrap() const;
|
||||
View *unwrap();
|
||||
|
||||
@@ -146,7 +146,7 @@ public:
|
||||
void releaseMouse() override;
|
||||
void releaseKeyboard() override;
|
||||
void setFocus(Qt::FocusReason reason) override;
|
||||
Qt::FocusPolicy focusPolicy() const;
|
||||
Qt::FocusPolicy focusPolicy() const override;
|
||||
/// TODOv2: Make these 2 virtual ?
|
||||
void setFocusPolicy(Qt::FocusPolicy policy);
|
||||
QString objectName() const override;
|
||||
|
||||
@@ -352,3 +352,8 @@ bool ViewWrapper_qtwidgets::close()
|
||||
{
|
||||
return m_widget->close();
|
||||
}
|
||||
|
||||
Qt::FocusPolicy ViewWrapper_qtwidgets::focusPolicy() const
|
||||
{
|
||||
return m_widget->focusPolicy();
|
||||
}
|
||||
|
||||
@@ -62,6 +62,7 @@ public:
|
||||
bool testAttribute(Qt::WidgetAttribute) const override;
|
||||
void setCursor(Qt::CursorShape) override;
|
||||
QSize minSize() const override;
|
||||
Qt::FocusPolicy focusPolicy() const override;
|
||||
|
||||
QWidget *widget() const;
|
||||
|
||||
|
||||
@@ -336,6 +336,11 @@ public:
|
||||
return QWidget::isMaximized();
|
||||
}
|
||||
|
||||
Qt::FocusPolicy focusPolicy() const override
|
||||
{
|
||||
return QWidget::focusPolicy();
|
||||
}
|
||||
|
||||
std::shared_ptr<ViewWrapper> childViewAt(QPoint localPos) const override
|
||||
{
|
||||
if (QWidget *child = QWidget::childAt(localPos))
|
||||
|
||||
@@ -184,3 +184,9 @@ TEST_CASE("View::closeRequested")
|
||||
rootView->close();
|
||||
CHECK(signalArrived);
|
||||
}
|
||||
|
||||
TEST_CASE("View::focusPolicy")
|
||||
{
|
||||
auto rootView = Platform::instance()->tests_createView({});
|
||||
CHECK_EQ(rootView->focusPolicy(), Qt::NoFocus);
|
||||
}
|
||||
|
||||
@@ -78,3 +78,9 @@ TEST_CASE("ViewWrapper::objectName")
|
||||
rootView->setObjectName(newName);
|
||||
CHECK_EQ(rootView->objectName(), newName);
|
||||
}
|
||||
|
||||
TEST_CASE("View::focusPolicy")
|
||||
{
|
||||
auto rootView = Platform::instance()->tests_createView({});
|
||||
CHECK_EQ(rootView->asWrapper()->focusPolicy(), Qt::NoFocus);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user