Fix cursor sometimes not hiding in fullscreen

Remove the remaining cursor logic from JMP and rely upon jellyfin-web's
behavior exclusively.

Resolves #183

Author: Andrew Rabert

native/nativeshell.js

@@ -303,7 +303,7 @@ window.initCompleted = new Promise(async (resolve) => {
         for (const mutation of mutations) {
             if (mutation.attributeName === 'class') {
                 const isIdle = document.body.classList.contains('mouseIdle');
-                window.api.system.setCursorVisibility(!isIdle);
+                window.api.window.setCursorVisibility(!isIdle);
             }
         }
     });

src/system/SystemComponent.cpp

@@ -55,7 +55,7 @@ QMap<SystemComponent::PlatformArch, QString> g_platformArchNames = {
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-SystemComponent::SystemComponent(QObject* parent) : ComponentBase(parent), m_platformType(platformTypeUnknown), m_platformArch(platformArchUnknown), m_doLogMessages(false), m_cursorVisible(true), m_scale(1), m_connectivityCheckReply(nullptr), m_resolveUrlReply(nullptr)
+SystemComponent::SystemComponent(QObject* parent) : ComponentBase(parent), m_platformType(platformTypeUnknown), m_platformArch(platformArchUnknown), m_doLogMessages(false), m_scale(1), m_connectivityCheckReply(nullptr), m_resolveUrlReply(nullptr)
 {
   m_connectivityRetryTimer = new QTimer(this);
   m_connectivityRetryTimer->setSingleShot(true);
@@ -100,9 +100,6 @@ bool SystemComponent::componentInitialize()
   QDir().mkpath(Paths::dataDir("scripts"));
   QDir().mkpath(Paths::dataDir("sounds"));
 
-  // Hide mouse pointer on any keyboard input
-  connect(&InputComponent::Get(), &InputComponent::receivedInput, [=]() { setCursorVisibility(false); });
-
   return true;
 }
 
@@ -421,33 +418,6 @@ void SystemComponent::cancelServerConnectivity()
   m_pendingConnectivityUrl.clear();
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-void SystemComponent::setCursorVisibility(bool visible)
-{
-  if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webMode") == "desktop")
-    visible = true;
-
-  if (visible == m_cursorVisible)
-    return;
-
-  m_cursorVisible = visible;
-
-  if (visible)
-  {
-    qApp->restoreOverrideCursor();
-  }
-  else
-  {
-    qApp->setOverrideCursor(QCursor(Qt::BlankCursor));
-  }
-
-#ifdef Q_OS_MAC
-  // OSX notifications will reset the cursor image (without Qt's knowledge). The
-  // only thing we can do override this is using Cocoa's native cursor hiding.
-  OSXUtils::SetCursorVisible(visible);
-#endif
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 QString SystemComponent::getUserAgent()
 {

src/system/SystemComponent.h

@@ -47,8 +47,6 @@ class SystemComponent : public ComponentBase
   QString extractBaseUrl(const QString& url);
   void resolveUrl(const QString& url, std::function<void(const QString&)> callback);
 
-  Q_INVOKABLE void setCursorVisibility(bool visible);
-
   Q_INVOKABLE QString getUserAgent();
 
   Q_INVOKABLE QString debugInformation();
@@ -105,7 +103,6 @@ class SystemComponent : public ComponentBase
   bool isWebClientConnected() const { return !m_webClientVersion.isEmpty(); }
 
   inline QString authenticationToken() { return m_authenticationToken; }
-  inline bool cursorVisible() { return m_cursorVisible; }
 
   Q_INVOKABLE void crashApp();
 
@@ -137,7 +134,6 @@ private Q_SLOTS:
   bool m_doLogMessages;
   QString m_authenticationToken;
   QString m_webClientVersion;
-  bool m_cursorVisible;
   qreal m_scale;
   QNetworkReply* m_connectivityCheckReply;
   QNetworkReply* m_resolveUrlReply;

src/ui/WindowManager.cpp

@@ -6,7 +6,9 @@
 #include "display/DisplayComponent.h"
 #include "taskbar/TaskbarComponent.h"
 #include "input/InputComponent.h"
+#include "utils/Utils.h"
 
+#include <QCursor>
 #include <QGuiApplication>
 #include <QScreen>
 #include <QDebug>
@@ -25,6 +27,7 @@ WindowManager::WindowManager(QObject* parent)
     m_ignoreFullscreenSettingsChange(0),
     m_maximized(false),
     m_fullscreen(false),
+    m_cursorVisible(true),
     m_geometryChangeTimer(nullptr)
 {
 }
@@ -196,6 +199,25 @@ void WindowManager::toggleFullscreen()
   setFullScreen(!isFullScreen());
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void WindowManager::setCursorVisibility(bool visible)
+{
+  if (visible == m_cursorVisible)
+    return;
+
+  m_cursorVisible = visible;
+
+  if (visible)
+    qApp->restoreOverrideCursor();
+  else
+    qApp->setOverrideCursor(QCursor(Qt::BlankCursor));
+
+#ifdef Q_OS_MAC
+  OSXUtils::SetCursorVisible(visible);
+#endif
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void WindowManager::raiseWindow()
 {

src/ui/WindowManager.h

@@ -43,6 +43,9 @@ class WindowManager : public ComponentBase
   Q_INVOKABLE void setFullScreen(bool enable);
   Q_INVOKABLE bool isFullScreen() const;
 
+  // Cursor visibility
+  Q_INVOKABLE void setCursorVisibility(bool visible);
+
   // Window activation
   Q_INVOKABLE void raiseWindow();
 
@@ -86,6 +89,7 @@ private slots:
   QRect m_normalGeometry;
   bool m_maximized;
   bool m_fullscreen;
+  bool m_cursorVisible;
   QTimer* m_geometryChangeTimer;
   QRect m_pendingGeometry;
 };