Merge branch 'main' of github.com:zhulik/deckfm

zhulik · Jun 21, 2023 · bad9d55 · bad9d55
2 parents 809dad6 + 7f1e933
commit bad9d55
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 16 deletions.
diff --git a/deckfm.sh b/deckfm.sh
@@ -2,4 +2,7 @@
 
 set -eu
 
-QSG_INFO=1 QSG_RENDER_LOOP=basic QT_QPA_PLATFORM=wayland LD_LIBRARY_PATH=$(pwd) ./build/deckfm
+#export QT_SCALE_FACTOR=3
+
+export LD_LIBRARY_PATH=$(pwd)
+./build/deckfm
diff --git a/resources/qml/DebugOverlay.qml b/resources/qml/DebugOverlay.qml
@@ -18,12 +18,6 @@ Item {
         opacity: 0.6
     }
 
-    MouseArea {
-        anchors.fill: parent
-
-        onClicked: steam_input.actionSetLayer = "file_manager"
-    }
-
     Steamworks.SteamInputScope {
         id: input
         onInputEvent: {

diff --git a/resources/qml/Header.qml b/resources/qml/Header.qml
@@ -19,6 +19,10 @@ ToolBar {
             onClicked: root.menuClicked()
         }
 
+        BusyIndicator {
+            running: true
+        }
+
         MDI.Button {
             text: "DECKFM"
             font.pointSize: 24

diff --git a/resources/qml/MainWindow.qml b/resources/qml/MainWindow.qml
@@ -30,7 +30,7 @@ ApplicationWindow {
     }
 
     width: 1280
-    height: 800
+    height: 720
 
     SteamUtils {
         id: steamUtils
@@ -67,6 +67,7 @@ ApplicationWindow {
 
     Shortcut {
         sequence: "F2"
+
         context: Qt.ApplicationShortcut
 
         onActivated: drawer.visible = !drawer.visible
@@ -79,6 +80,13 @@ ApplicationWindow {
         onActivated: debugOverlay.toggle()
     }
 
+    Shortcut {
+        sequence: "F4"
+        context: Qt.ApplicationShortcut
+
+        onActivated: Qt.quit()
+    }
+
     Steamworks.SteamInputScope {
         pressHandlers: {
             "debug": debugOverlay.toggle,

diff --git a/src/QSteamworks/action.cpp b/src/QSteamworks/action.cpp
@@ -1,10 +1,12 @@
 #include "action.h"
+#include "qglobal.h"
 
 using namespace QSteamworks;
 
 Action::Action(unsigned long long handle, ActionDefinition *definition, const QString &localizedName,
                const QStringList &origins, const QStringList &glyphs)
     : m_handle(handle), m_definition(definition), m_localizedName(localizedName), m_origins(origins), m_glyphs(glyphs) {
+  Q_ASSERT(m_definition != 0);
 }
 
 const ActionDefinition *Action::actionDefinition() const { return m_definition; }

diff --git a/src/QSteamworks/action.h b/src/QSteamworks/action.h
@@ -9,7 +9,7 @@ namespace QSteamworks {
 class Action {
   Q_GADGET
   Q_PROPERTY(unsigned long long handle READ handle CONSTANT)
-  Q_PROPERTY(QSteamworks::ActionDefinition actionDefinition READ actionDefinition CONSTANT)
+  Q_PROPERTY(const QSteamworks::ActionDefinition *actionDefinition READ actionDefinition CONSTANT)
   Q_PROPERTY(QString localizedName READ localizedName CONSTANT)
   Q_PROPERTY(QStringList glyphs READ glyphs CONSTANT)
   Q_PROPERTY(QStringList origins READ origins CONSTANT)

diff --git a/src/QSteamworks/actionset.cpp b/src/QSteamworks/actionset.cpp
@@ -1,6 +1,8 @@
 #include "actionset.h"
 #include "actionsetlayer.h"
 
+#include <QDebug>
+
 using namespace QSteamworks;
 
 ActionSet::ActionSet(InputActionSetHandle_t handle, const QString &name, const QList<Action> &actions,

diff --git a/src/QSteamworks/qsteamapi.cpp b/src/QSteamworks/qsteamapi.cpp
@@ -18,3 +18,5 @@ QSteamAPI::QSteamAPI(QObject *parent) : QObject{parent} {
 QSteamAPI::~QSteamAPI() { SteamAPI_Shutdown(); }
 
 void QSteamAPI::runCallbacks() const { SteamAPI_RunCallbacks(); }
+
+bool QSteamAPI::RestartAppIfNecessary() const { return SteamAPI_RestartAppIfNecessary(480); }
diff --git a/src/QSteamworks/qsteamapi.h b/src/QSteamworks/qsteamapi.h
@@ -17,5 +17,6 @@ class QSteamAPI : public QObject {
 
   Q_INVOKABLE
   void runCallbacks() const;
+  bool RestartAppIfNecessary() const;
 };
 } // namespace QSteamworks
diff --git a/src/QSteamworks/qsteaminput.cpp b/src/QSteamworks/qsteaminput.cpp
@@ -334,6 +334,12 @@ void QSteamInput::onConfigurationLoaded(SteamInputConfigurationLoaded_t *) {
   updateActionSets();
   setActionSet(m_defaultActionSet);
   setActionSetLayer(m_defaultActionSetLayer);
+  auto cb = [](SteamInputActionEvent_t *event) {
+    QSteamInput::instance()->onActionEvent(event); // Dirty hack, but I didn't find a better way
+  };
+
+  SteamInput()->EnableActionEventCallbacks(cb);
+
   emit configurationLoaded();
 }
 
@@ -423,13 +429,9 @@ void QSteamInput::setIgaPath(const QString &newIgaPath) {
   m_iga = new IGA(VDFParser().parse(vdfContent));
   emit igaChanged();
 
-  SteamInput()->EnableDeviceCallbacks();
+  qDebug() << m_iga->actionSets().first()->layers().count();
 
-  auto cb = [](SteamInputActionEvent_t *event) {
-    QSteamInput::instance()->onActionEvent(event); // Dirty hack, but I didn't find a better way
-  };
-
-  SteamInput()->EnableActionEventCallbacks(cb);
+  SteamInput()->EnableDeviceCallbacks();
 }
 
 const QString &QSteamInput::defaultActionSet() const { return m_defaultActionSet; }
@@ -457,6 +459,8 @@ void QSteamInput::setActionSetLayer(const QString &newActionSetLayer) {
   }
 
   SteamInput()->DeactivateAllActionSetLayers(m_currentController.handle());
+  m_currentActionSetLayer = ActionSetLayer();
+  emit actionSetLayerChanged();
 
   foreach (auto &layer, m_actionSet.layers()) {
     if (layer.name() == newActionSetLayer) {

diff --git a/src/application.cpp b/src/application.cpp
@@ -65,8 +65,9 @@ Application::Application(int &argc, char **argv) : QGuiApplication{argc, argv} {
       QObject::connect(mainWindow, &QQuickWindow::frameSwapped, runCallbacks);
     }
 
+    qDebug() << arguments().at(1);
     if (arguments().count() > 1) {
-      mainWindow->setProperty("openFile", arguments()[1]);
+      mainWindow->setProperty("openFile", arguments().at(1));
     }
   });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,5 @@ QSteamAPI::QSteamAPI(QObject *parent) : QObject{parent} {
		QSteamAPI::~QSteamAPI() { SteamAPI_Shutdown(); }

		void QSteamAPI::runCallbacks() const { SteamAPI_RunCallbacks(); }

		bool QSteamAPI::RestartAppIfNecessary() const { return SteamAPI_RestartAppIfNecessary(480); }