Files

128 lines
3.5 KiB
C++
Raw Permalink Normal View History

Improve navigation cpp (#1061) * add focusController class * add more key handlers * add focus navigation to qml * fixed language selector * add reverse focus change to FocusController * add default focus item * update transitions * update pages * add ListViewFocusController * fix ListView navigation * update CardType for using with focus navigation * remove useless key navigation * remove useless slots, logs, Drawer open and close * fix reverse focus move on listView * fix drawer radio buttons selection * fix drawer layout and focus move * fix PageSetupWizardProtocolSettings focus move * fix back navigation on default focus item * fix crashes after ListView navigation * fix protocol settings focus move * fix focus on users on page share * clean up page share * fix server rename * fix page share default server selection * refactor about page for correct focus move * fix focus move on list views with header and-or footer * minor fixes * fix server list back button handler * fix spawn signals on switch * fix share details drawer * fix drawer open close usage * refactor listViewFocusController * refactor focusController to make the logic more straightforward * fix focus on notification * update config page for scrolling with tab * fix crash on return with esc key * fix focus navigation in dynamic delegate of list view * fix focus move on qr code on share page * refactor page logging settings for focus navigation * update popup * Bump version * Add mandatory requirement for android.software.leanback. * Fix importing files on TVs * fix: add separate method for reading files to fix file reading on Android TV * fix(android): add CHANGE_NETWORK_STATE permission for all Android versions * Fix connection check for AWG/WG * chore: minor fixes (#1235) * fix: add a workaround to open files on Android TV due to lack of SAF * fix: change the banner format for TV * refactor: make TvFilePicker activity more sustainable * fix: add the touch emulation method for Android TV * fix: null uri processing * fix: add the touch emulation method for Android TV * fix: hide UI elements that use file saving * chore: bump version code * add `ScrollBarType` * update initial config page * refactor credentials setup page to handle the focus navigation * add `setDelegateIndex` method to `listViewFocusController` * fix focus behavior on new page/popup * make minor fixes and clean up * fix: get rid of the assign function call * Scrollbar is on if the content is larger than a screen * Fix selection in language change list * Update select language list * update logging settings page * fix checked item in lists * fix split tunneling settings * make unchangable properties readonly * refactor SwitcherType * fix hide/unhide password * `PageShare` readonly properties * Fix list view focus moving on `PageShare` * remove manual focus control on `PageShare` * format `ListViewFocusController` * format `FocusController` * add `focusControl` with utility functions for focus control * refactor `listViewFocusController` acoording to `focusControl` * refactor `focusConroller` according to `focusControl` * add `printSectionName` method to `listViewController` * remove arrow from `Close application` item * fix focus movement in `ServersListView` * `Restore from backup` is visible only on start screen * `I have nothing` is visible only on start screen * fix back button on `SelectLanguageDrawer` * rename `focusControl` to `qmlUtils` * fix `CMakeLists.txt` * fix `ScrollBarType` * fix `PageSetupWizardApiServicesList` * fix focus movement on dynamic delegates in listView * refactor `PageSetupWizardProtocols` * remove comments and clean up * fix `ListViewWithLabelsType` * fix `PageProtocolCloakSettings` * fix `PageSettingsAppSplitTunneling` * fix `PageDevMenu` * remove debug output from `FocusController` * remove debug output from `ListViewFocusController` * remove debug output from `focusControl` * `focusControl` => `FocusControl` --------- Co-authored-by: albexk <albexk@proton.me> Co-authored-by: Nethius <nethiuswork@gmail.com>
2024-12-31 04:16:52 +01:00
#include "qmlUtils.h"
#include <QPointF>
#include <QQuickItem>
#include <QQuickWindow>
namespace FocusControl
{
QPointF getItemCenterPointOnScene(QQuickItem *item)
{
const auto x0 = item->x() + (item->width() / 2);
const auto y0 = item->y() + (item->height() / 2);
return item->parentItem()->mapToScene(QPointF { x0, y0 });
}
bool isEnabled(QObject *obj)
{
const auto item = qobject_cast<QQuickItem *>(obj);
return item && item->isEnabled();
}
bool isVisible(QObject *item)
{
const auto res = item->property("visible").toBool();
return res;
}
bool isFocusable(QObject *item)
{
const auto res = item->property("isFocusable").toBool();
return res;
}
bool isListView(QObject *item)
{
return item->inherits("QQuickListView");
}
bool isOnTheScene(QObject *object)
{
QQuickItem *item = qobject_cast<QQuickItem *>(object);
if (!item) {
qWarning() << "Couldn't recognize object as item";
return false;
}
if (!item->isVisible()) {
return false;
}
QRectF itemRect = item->mapRectToScene(item->childrenRect());
QQuickWindow *window = item->window();
if (!window) {
qWarning() << "Couldn't get the window on the Scene check";
return false;
}
const auto contentItem = window->contentItem();
if (!contentItem) {
qWarning() << "Couldn't get the content item on the Scene check";
return false;
}
QRectF windowRect = contentItem->childrenRect();
const auto res = (windowRect.contains(itemRect) || isListView(item));
return res;
}
bool isMore(QObject *item1, QObject *item2)
{
return !isLess(item1, item2);
}
bool isLess(QObject *item1, QObject *item2)
{
const auto p1 = getItemCenterPointOnScene(qobject_cast<QQuickItem *>(item1));
const auto p2 = getItemCenterPointOnScene(qobject_cast<QQuickItem *>(item2));
return (p1.y() == p2.y()) ? (p1.x() < p2.x()) : (p1.y() < p2.y());
}
QList<QObject *> getSubChain(QObject *object)
{
QList<QObject *> res;
if (!object) {
return res;
}
const auto children = object->children();
for (const auto child : children) {
if (child && isFocusable(child) && isOnTheScene(child) && isEnabled(child)) {
res.append(child);
} else {
res.append(getSubChain(child));
}
}
return res;
}
QList<QObject *> getItemsChain(QObject *object)
{
QList<QObject *> res;
if (!object) {
return res;
}
const auto children = object->children();
for (const auto child : children) {
if (child && isFocusable(child) && isEnabled(child) && isVisible(child)) {
res.append(child);
} else {
res.append(getItemsChain(child));
}
}
return res;
}
void printItems(const QList<QObject *> &items, QObject *current_item)
{
for (const auto &item : items) {
QQuickItem *i = qobject_cast<QQuickItem *>(item);
QPointF coords { getItemCenterPointOnScene(i) };
QString prefix = current_item == i ? "==>" : " ";
qDebug() << prefix << " Item: " << i << " with coords: " << coords;
}
}
} // namespace FocusControl