AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format FocusController

Browse source
This commit is contained in:
Cyril Anisimov 2024-12-16 22:12:15 +01:00
parent a57e94e4f2
commit 11d20974f0
2 changed files with 56 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

90
client/ui/controllers/focusController.cpp
View file

@ -1,19 +1,16 @@
#include "focusController.h" #include "focusController.h"
#include "listViewFocusController.h"
#include <QQuickWindow>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQuickWindow>
bool isListView(QObject *item)
bool isListView(QObject* item)
{ {
return item->inherits("QQuickListView"); return item->inherits("QQuickListView");
} }
bool isOnTheScene(QObject* object) bool isOnTheScene(QObject *object)
{ {
QQuickItem* item = qobject_cast<QQuickItem*>(object); QQuickItem *item = qobject_cast<QQuickItem *>(object);
if (!item) { if (!item) {
qWarning() << "Couldn't recognize object as item"; qWarning() << "Couldn't recognize object as item";
return false; return false;
@ -26,7 +23,7 @@ bool isOnTheScene(QObject* object)
QRectF itemRect = item->mapRectToScene(item->childrenRect()); QRectF itemRect = item->mapRectToScene(item->childrenRect());
QQuickWindow* window = item->window(); QQuickWindow *window = item->window();
if (!window) { if (!window) {
qWarning() << "Couldn't get the window on the Scene check"; qWarning() << "Couldn't get the window on the Scene check";
return false; return false;
@ -39,13 +36,14 @@ bool isOnTheScene(QObject* object)
} }
QRectF windowRect = contentItem->childrenRect(); QRectF windowRect = contentItem->childrenRect();
const auto res = (windowRect.contains(itemRect) || isListView(item)); const auto res = (windowRect.contains(itemRect) || isListView(item));
// qDebug() << (res ? "===>> item is inside the Scene" : "===>> ITEM IS OUTSIDE THE SCENE") << " itemRect: " << itemRect << "; windowRect: " << windowRect; // qDebug() << (res ? "===>> item is inside the Scene" : "===>> ITEM IS OUTSIDE THE SCENE") << " itemRect: " <<
// itemRect << "; windowRect: " << windowRect;
return res; return res;
} }
QList<QObject*> getSubChain(QObject* object) QList<QObject *> getSubChain(QObject *object)
{ {
QList<QObject*> res; QList<QObject *> res;
if (!object) { if (!object) {
qDebug() << "The object is NULL"; qDebug() << "The object is NULL";
return res; return res;
@ -53,12 +51,8 @@ QList<QObject*> getSubChain(QObject* object)
const auto children = object->children(); const auto children = object->children();
for(const auto child : children) { for (const auto child : children) {
if (child if (child && focusControlTools::isFocusable(child) && isOnTheScene(child) && focusControlTools::isEnabled(child)) {
&& isFocusable(child)
&& isOnTheScene(child)
&& isEnabled(child)
) {
res.append(child); res.append(child);
} else { } else {
res.append(getSubChain(child)); res.append(getSubChain(child));
@ -67,29 +61,28 @@ QList<QObject*> getSubChain(QObject* object)
return res; return res;
} }
FocusController::FocusController(QQmlApplicationEngine* engine, QObject *parent) FocusController::FocusController(QQmlApplicationEngine *engine, QObject *parent)
: QObject{parent} : QObject { parent },
, m_engine{engine} m_engine { engine },
, m_focusChain{} m_focusChain {},
, m_focusedItem{nullptr} m_focusedItem { nullptr },
, m_rootObjects{} m_rootObjects {},
, m_defaultFocusItem{QSharedPointer<QQuickItem>()} m_defaultFocusItem { QSharedPointer<QQuickItem>() },
, m_lvfc{nullptr} m_lvfc { nullptr }
{ {
QObject::connect(m_engine.get(), &QQmlApplicationEngine::objectCreated, this, [this](QObject *object, const QUrl &url){ QObject::connect(m_engine.get(), &QQmlApplicationEngine::objectCreated, this,
QQuickItem* newDefaultFocusItem = object->findChild<QQuickItem*>("defaultFocusItem"); [this](QObject *object, const QUrl &url) {
if(newDefaultFocusItem && m_defaultFocusItem != newDefaultFocusItem) { QQuickItem *newDefaultFocusItem = object->findChild<QQuickItem *>("defaultFocusItem");
if (newDefaultFocusItem && m_defaultFocusItem != newDefaultFocusItem) {
m_defaultFocusItem.reset(newDefaultFocusItem); m_defaultFocusItem.reset(newDefaultFocusItem);
qDebug() << "===>> NEW DEFAULT FOCUS ITEM: " << m_defaultFocusItem; qDebug() << "===>> NEW DEFAULT FOCUS ITEM: " << m_defaultFocusItem;
} }
}); });
QObject::connect(this, &FocusController::focusedItemChanged, this, [this]() { QObject::connect(this, &FocusController::focusedItemChanged, this,
m_focusedItem->forceActiveFocus(Qt::TabFocusReason); [this]() { m_focusedItem->forceActiveFocus(Qt::TabFocusReason); });
});
} }
void FocusController::nextKeyTabItem() void FocusController::nextKeyTabItem()
{ {
nextItem(Direction::Forward); nextItem(Direction::Forward);
@ -120,7 +113,7 @@ void FocusController::nextKeyRightItem()
nextItem(Direction::Forward); nextItem(Direction::Forward);
} }
void FocusController::setFocusItem(QQuickItem* item) void FocusController::setFocusItem(QQuickItem *item)
{ {
if (m_focusedItem != item) { if (m_focusedItem != item) {
m_focusedItem = item; m_focusedItem = item;
@ -137,7 +130,7 @@ void FocusController::setFocusOnDefaultItem()
setFocusItem(m_defaultFocusItem.get()); setFocusItem(m_defaultFocusItem.get());
} }
void FocusController::pushRootObject(QObject* object) void FocusController::pushRootObject(QObject *object)
{ {
qDebug() << "===>> Calling < pushRootObject >..."; qDebug() << "===>> Calling < pushRootObject >...";
m_rootObjects.push(object); m_rootObjects.push(object);
@ -147,7 +140,7 @@ void FocusController::pushRootObject(QObject* object)
qDebug() << "===>> ROOT OBJECTS: " << m_rootObjects; qDebug() << "===>> ROOT OBJECTS: " << m_rootObjects;
} }
void FocusController::dropRootObject(QObject* object) void FocusController::dropRootObject(QObject *object)
{ {
qDebug() << "===>> Calling < dropRootObject >..."; qDebug() << "===>> Calling < dropRootObject >...";
if (m_rootObjects.empty()) { if (m_rootObjects.empty()) {
@ -160,7 +153,7 @@ void FocusController::dropRootObject(QObject* object)
m_rootObjects.pop(); m_rootObjects.pop();
dropListView(); dropListView();
setFocusOnDefaultItem(); setFocusOnDefaultItem();
if(m_rootObjects.size()) { if (m_rootObjects.size()) {
qDebug() << "===>> ROOT OBJECT is changed to: " << m_rootObjects.top(); qDebug() << "===>> ROOT OBJECT is changed to: " << m_rootObjects.top();
} else { } else {
qDebug() << "===>> ROOT OBJECT is changed to DEFAULT"; qDebug() << "===>> ROOT OBJECT is changed to DEFAULT";
@ -182,11 +175,9 @@ void FocusController::reload(Direction direction)
qDebug() << "===>> Calling < reload >..."; qDebug() << "===>> Calling < reload >...";
m_focusChain.clear(); m_focusChain.clear();
QObject* rootObject = (m_rootObjects.empty() QObject *rootObject = (m_rootObjects.empty() ? m_engine->rootObjects().value(0) : m_rootObjects.top());
? m_engine->rootObjects().value(0)
: m_rootObjects.top());
if(!rootObject) { if (!rootObject) {
qCritical() << "No ROOT OBJECT found!"; qCritical() << "No ROOT OBJECT found!";
resetRootObject(); resetRootObject();
dropListView(); dropListView();
@ -197,7 +188,8 @@ void FocusController::reload(Direction direction)
m_focusChain.append(getSubChain(rootObject)); m_focusChain.append(getSubChain(rootObject));
std::sort(m_focusChain.begin(), m_focusChain.end(), direction == Direction::Forward ? isLess : isMore); std::sort(m_focusChain.begin(), m_focusChain.end(),
direction == Direction::Forward ? focusControlTools::isLess : focusControlTools::isMore);
if (m_focusChain.empty()) { if (m_focusChain.empty()) {
qWarning() << "Focus chain is empty!"; qWarning() << "Focus chain is empty!";
@ -220,7 +212,7 @@ void FocusController::nextItem(Direction direction)
return; return;
} }
if(m_focusChain.empty()) { if (m_focusChain.empty()) {
qWarning() << "There are no items to navigate"; qWarning() << "There are no items to navigate";
setFocusOnDefaultItem(); setFocusOnDefaultItem();
return; return;
@ -239,19 +231,19 @@ void FocusController::nextItem(Direction direction)
focusedItemIndex++; focusedItemIndex++;
} }
const auto focusedItem = qobject_cast<QQuickItem*>(m_focusChain.at(focusedItemIndex)); const auto focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(focusedItemIndex));
if(focusedItem == nullptr) { if (focusedItem == nullptr) {
qWarning() << "Failed to get item to focus on. Setting focus on default"; qWarning() << "Failed to get item to focus on. Setting focus on default";
setFocusOnDefaultItem(); setFocusOnDefaultItem();
return; return;
} }
if(isListView(focusedItem)) { if (isListView(focusedItem)) {
qDebug() << "===>> Found [ListView]"; qDebug() << "===>> Found [ListView]";
m_lvfc = new ListViewFocusController(focusedItem, this); m_lvfc = new ListViewFocusController(focusedItem, this);
m_focusedItem = focusedItem; m_focusedItem = focusedItem;
if(direction == Direction::Forward) { if (direction == Direction::Forward) {
m_lvfc->nextDelegate(); m_lvfc->nextDelegate();
focusNextListViewItem(); focusNextListViewItem();
} else { } else {
@ -263,7 +255,7 @@ void FocusController::nextItem(Direction direction)
setFocusItem(focusedItem); setFocusItem(focusedItem);
printItems(m_focusChain, focusedItem); focusControlTools::printItems(m_focusChain, focusedItem);
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -271,7 +263,7 @@ void FocusController::nextItem(Direction direction)
qDebug() << "===>> CURRENT ACTIVE ITEM: " << w->activeFocusItem(); qDebug() << "===>> CURRENT ACTIVE ITEM: " << w->activeFocusItem();
qDebug() << "===>> CURRENT FOCUS OBJECT: " << w->focusObject(); qDebug() << "===>> CURRENT FOCUS OBJECT: " << w->focusObject();
if(m_rootObjects.empty()) { if (m_rootObjects.empty()) {
qDebug() << "===>> ROOT OBJECT IS DEFAULT"; qDebug() << "===>> ROOT OBJECT IS DEFAULT";
} else { } else {
qDebug() << "===>> ROOT OBJECT: " << m_rootObjects.top(); qDebug() << "===>> ROOT OBJECT: " << m_rootObjects.top();
@ -317,7 +309,7 @@ void FocusController::dropListView()
{ {
qDebug() << "===>> Calling < dropListView >..."; qDebug() << "===>> Calling < dropListView >...";
if(m_lvfc) { if (m_lvfc) {
delete m_lvfc; delete m_lvfc;
m_lvfc = nullptr; m_lvfc = nullptr;
} }

25
client/ui/controllers/focusController.h
View file

@ -1,14 +1,9 @@
#ifndef FOCUSCONTROLLER_H #ifndef FOCUSCONTROLLER_H
#define FOCUSCONTROLLER_H #define FOCUSCONTROLLER_H
#include <QObject> #include "ui/controllers/listViewFocusController.h"
#include <QStack>
#include <QSharedPointer>
#include <QQmlApplicationEngine>
class QQuickItem;
class QQmlApplicationEngine;
class ListViewFocusController;
/*! /*!
* \brief The FocusController class makes focus control more straightforward * \brief The FocusController class makes focus control more straightforward
@ -20,7 +15,7 @@ class FocusController : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit FocusController(QQmlApplicationEngine* engine, QObject *parent = nullptr); explicit FocusController(QQmlApplicationEngine *engine, QObject *parent = nullptr);
~FocusController() override = default; ~FocusController() override = default;
Q_INVOKABLE void nextKeyTabItem(); Q_INVOKABLE void nextKeyTabItem();
@ -29,10 +24,10 @@ public:
Q_INVOKABLE void nextKeyDownItem(); Q_INVOKABLE void nextKeyDownItem();
Q_INVOKABLE void nextKeyLeftItem(); Q_INVOKABLE void nextKeyLeftItem();
Q_INVOKABLE void nextKeyRightItem(); Q_INVOKABLE void nextKeyRightItem();
Q_INVOKABLE void setFocusItem(QQuickItem* item); Q_INVOKABLE void setFocusItem(QQuickItem *item);
Q_INVOKABLE void setFocusOnDefaultItem(); Q_INVOKABLE void setFocusOnDefaultItem();
Q_INVOKABLE void pushRootObject(QObject* object); Q_INVOKABLE void pushRootObject(QObject *object);
Q_INVOKABLE void dropRootObject(QObject* object); Q_INVOKABLE void dropRootObject(QObject *object);
Q_INVOKABLE void resetRootObject(); Q_INVOKABLE void resetRootObject();
private: private:
@ -48,12 +43,12 @@ private:
void dropListView(); void dropListView();
QSharedPointer<QQmlApplicationEngine> m_engine; // Pointer to engine to get root object QSharedPointer<QQmlApplicationEngine> m_engine; // Pointer to engine to get root object
QList<QObject*> m_focusChain; // List of current objects to be focused QList<QObject *> m_focusChain; // List of current objects to be focused
QQuickItem* m_focusedItem; // Pointer to the active focus item QQuickItem *m_focusedItem; // Pointer to the active focus item
QStack<QObject*> m_rootObjects; QStack<QObject *> m_rootObjects;
QSharedPointer<QQuickItem> m_defaultFocusItem; QSharedPointer<QQuickItem> m_defaultFocusItem;
ListViewFocusController* m_lvfc; // ListView focus manager ListViewFocusController *m_lvfc; // ListView focus manager
signals: signals:
void focusedItemChanged(); void focusedItemChanged();