Fix focusing the first/last item in a qtquickwidget

TheOneRing · TheOneRing · commit 88677493cde2 · 2024-06-24T11:28:20.000+02:00
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -71,9 +71,8 @@ AccountSettings::AccountSettings(const AccountStatePtr &accountState, QWidget *p
 
     _sortModel = weightedModel;
 
-    ui->quickWidget->rootContext()->setContextProperty(QStringLiteral("ctx"), this);
     ui->quickWidget->engine()->addImageProvider(QStringLiteral("space"), new Spaces::SpaceImageProvider(_accountState->account()));
-    QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/qml/FolderDelegate.qml")));
+    QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/qml/FolderDelegate.qml")), this);
 
     connect(FolderMan::instance(), &FolderMan::folderListChanged, _model, &FolderStatusModel::resetFolders);
     ui->connectLabel->clear();
diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui
@@ -144,7 +144,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QQuickWidget" name="quickWidget"/>
+     <widget class="OCC::QmlUtils::OCQuickWidget" name="quickWidget"/>
     </widget>
    </item>
   </layout>
@@ -156,6 +156,12 @@
    <header>QProgressIndicator.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>OCC::QmlUtils::OCQuickWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/qmlutils.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../resources/client.qrc"/>
diff --git a/src/gui/qml/AccountBar.qml b/src/gui/qml/AccountBar.qml
@@ -20,8 +20,25 @@ import org.ownCloud.libsync 1.0
 
 Pane {
     id: bar
+    readonly property SettingsDialog settingsDialog: ocContext
     Accessible.name: qsTr("Navigation bar")
 
+    Connections {
+        target: settingsDialog
+
+        function onFocusFirst() {
+            if (accountButtons.count === 0) {
+                addAccountButton.forceActiveFocus(Qt.TabFocusReason);
+            } else {
+                accountButtons.itemAt(0).forceActiveFocus(Qt.TabFocusReason);
+            }
+        }
+
+        function onFocusLast() {
+            quitButton.forceActiveFocus(Qt.TabFocusReason);
+        }
+    }
+
     RowLayout {
         anchors.fill: parent
 
diff --git a/src/gui/qml/FolderDelegate.qml b/src/gui/qml/FolderDelegate.qml
@@ -23,11 +23,27 @@ Pane {
     id: folderSyncPanel
     // TODO: not cool
     readonly property real normalSize: 170
-    readonly property AccountSettings accountSettings: ctx
+    readonly property AccountSettings accountSettings: ocContext
 
     Accessible.role: Accessible.List
     Accessible.name: qsTr("Folder Sync")
 
+    Connections {
+        target: accountSettings
+
+        function onFocusFirst() {
+            listView.currentIndex = 0;
+        }
+
+        function onFocusLast() {
+            if (addSyncButton.enabled) {
+                addSyncButton.forceActiveFocus(Qt.TabFocusReason);
+            } else {
+                listView.currentIndex = listView.count - 1;
+            }
+        }
+    }
+
     ColumnLayout {
         anchors.fill: parent
         ScrollView {
diff --git a/src/gui/qmlutils.cpp b/src/gui/qmlutils.cpp
@@ -17,10 +17,12 @@
 #include "resources/resources.h"
 
 #include <QMessageBox>
+#include <QQmlContext>
 #include <QQuickWidget>
 
-void OCC::QmlUtils::initQuickWidget(QQuickWidget *widget, const QUrl &src)
+void OCC::QmlUtils::initQuickWidget(OCQuickWidget *widget, const QUrl &src, QObject *ocContext)
 {
+    widget->rootContext()->setContextProperty(QStringLiteral("ocContext"), ocContext);
     widget->engine()->addImageProvider(QStringLiteral("ownCloud"), new OCC::Resources::CoreImageProvider());
     widget->setResizeMode(QQuickWidget::SizeRootObjectToView);
     widget->setSource(src);
@@ -30,4 +32,23 @@ void OCC::QmlUtils::initQuickWidget(QQuickWidget *widget, const QUrl &src)
         box->exec();
         qFatal("A qml error occured %s", qPrintable(QDebug::toString(widget->errors())));
     }
+
+    // string based connects as they are provided by OC_DECLARE_WIDGET_FOCUS and not inherited
+    QObject::connect(widget, SIGNAL(focusFirst()), ocContext, SIGNAL(focusFirst()));
+    QObject::connect(widget, SIGNAL(focusLast()), ocContext, SIGNAL(focusLast()));
+}
+
+void OCC::QmlUtils::OCQuickWidget::focusInEvent(QFocusEvent *event)
+{
+    switch (event->reason()) {
+    case Qt::TabFocusReason:
+        Q_EMIT focusFirst();
+        break;
+    case Qt::BacktabFocusReason:
+        Q_EMIT focusLast();
+        break;
+    default:
+        break;
+    }
+    QQuickWidget::focusInEvent(event);
 }
diff --git a/src/gui/qmlutils.h b/src/gui/qmlutils.h
@@ -13,9 +13,8 @@
  */
 
 #pragma once
+#include <QtQuickWidgets/QQuickWidget>
 
-
-class QQuickWidget;
 class QUrl;
 
 #define OC_DECLARE_WIDGET_FOCUS                                                                                                                                \
@@ -29,9 +28,26 @@ public:
         focusPreviousChild();                                                                                                                                  \
     }                                                                                                                                                          \
                                                                                                                                                                \
+Q_SIGNALS:                                                                                                                                                     \
+    void focusFirst();                                                                                                                                         \
+    void focusLast();                                                                                                                                          \
+                                                                                                                                                               \
 private:
 
 namespace OCC::QmlUtils {
+class OCQuickWidget : public QQuickWidget
+{
+    Q_OBJECT
+public:
+    using QQuickWidget::QQuickWidget;
+
+Q_SIGNALS:
+    void focusFirst();
+    void focusLast();
+
+protected:
+    void focusInEvent(QFocusEvent *event) override;
+};
 
-void initQuickWidget(QQuickWidget *widget, const QUrl &src);
+void initQuickWidget(OCQuickWidget *widget, const QUrl &src, QObject *ocContext);
 }
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
@@ -76,10 +76,9 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     // People perceive this as a Window, so also make Ctrl+W work
     addAction(tr("Hide"), Qt::CTRL | Qt::Key_W, this, &SettingsDialog::hide);
 
-    _ui->quickWidget->rootContext()->setContextProperty(QStringLiteral("settingsDialog"), this);
     // TODO: fix sizing
     _ui->quickWidget->setFixedHeight(minimumHeight() * 0.15);
-    QmlUtils::initQuickWidget(_ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/qml/AccountBar.qml")));
+    QmlUtils::initQuickWidget(_ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/qml/AccountBar.qml")), this);
     connect(
         _ui->quickWidget->engine(), &QQmlEngine::quit, QApplication::instance(),
         [this] {
diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui
@@ -44,14 +44,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="QQuickWidget" name="quickWidget">
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
+         <widget class="OCC::QmlUtils::OCQuickWidget" name="quickWidget" native="true"/>
         </item>
         <item>
          <widget class="QStackedWidget" name="stack"/>
@@ -65,9 +58,10 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QQuickWidget</class>
+   <class>OCC::QmlUtils::OCQuickWidget</class>
    <extends>QWidget</extends>
-   <header location="global">QtQuickWidgets/QQuickWidget</header>
+   <header>gui/qmlutils.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/gui/spaces/qml/SpacesView.qml b/src/gui/spaces/qml/SpacesView.qml
@@ -23,7 +23,7 @@ Pane {
     // TODO: not cool
     readonly property real normalSize: 170
 
-    //property SpacesBrowser spacesBrowser
+    readonly property SpacesBrowser spacesBrowser: ocContext
 
     ScrollView {
         id: scrollView
diff --git a/src/gui/spaces/spacesbrowser.cpp b/src/gui/spaces/spacesbrowser.cpp
@@ -42,8 +42,7 @@ SpacesBrowser::SpacesBrowser(QWidget *parent)
     _sortModel->setSortRole(static_cast<int>(SpacesModel::Roles::Priority));
     _sortModel->sort(0, Qt::DescendingOrder);
 
-    ui->quickWidget->rootContext()->setContextProperty(QStringLiteral("spacesBrowser"), this);
-    QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/spaces/qml/SpacesView.qml")));
+    QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/spaces/qml/SpacesView.qml")), this);
 }
 
 SpacesBrowser::~SpacesBrowser()
diff --git a/src/gui/spaces/spacesbrowser.ui b/src/gui/spaces/spacesbrowser.ui
@@ -27,19 +27,16 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QQuickWidget" name="quickWidget">
-     <property name="resizeMode">
-      <enum>QQuickWidget::SizeRootObjectToView</enum>
-     </property>
-    </widget>
+    <widget class="OCC::QmlUtils::OCQuickWidget" name="quickWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QQuickWidget</class>
+   <class>OCC::QmlUtils::OCQuickWidget</class>
    <extends>QWidget</extends>
-   <header location="global">QtQuickWidgets/QQuickWidget</header>
+   <header>gui/qmlutils.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ SpacesBrowser::SpacesBrowser(QWidget *parent)`
`42`	`42`	`_sortModel->setSortRole(static_cast<int>(SpacesModel::Roles::Priority));`
`43`	`43`	`_sortModel->sort(0, Qt::DescendingOrder);`
`44`	`44`
`45`		`- ui->quickWidget->rootContext()->setContextProperty(QStringLiteral("spacesBrowser"), this);`
`46`		`- QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/spaces/qml/SpacesView.qml")));`
	`45`	`+ QmlUtils::initQuickWidget(ui->quickWidget, QUrl(QStringLiteral("qrc:/qt/qml/org/ownCloud/gui/spaces/qml/SpacesView.qml")), this);`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`SpacesBrowser::~SpacesBrowser()`