فهرست منبع

Revert "KonvergoWindow: workaround for recursive web-client fullscren changes"

This reverts commit be5aaecfba227f12165730c778b99b5959efa770.

Didn't work; we fixed it properly.
Vincent Lang 8 سال پیش
والد
کامیت
9c0a723f33
2فایلهای تغییر یافته به همراه2 افزوده شده و 16 حذف شده
  1. 2 14
      src/ui/KonvergoWindow.cpp
  2. 0 2
      src/ui/KonvergoWindow.h

+ 2 - 14
src/ui/KonvergoWindow.cpp

@@ -37,9 +37,6 @@ KonvergoWindow::KonvergoWindow(QWindow* parent) :
   m_infoTimer->setInterval(1000);
   m_webDesktopMode = (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webMode").toString() == "desktop");
 
-  m_resizeHack = new QTimer(this);
-  m_resizeHack->setSingleShot(true);
-
   installEventFilter(new EventFilter(this));
 
   connect(m_infoTimer, &QTimer::timeout, this, &KonvergoWindow::updateDebugInfo);
@@ -309,15 +306,8 @@ void KonvergoWindow::updateMainSectionSettings(const QVariantMap& values)
 
   if (values.contains("fullscreen") && !m_ignoreFullscreenSettingsChange)
   {
-    if (m_resizeHack->isActive())
-    {
-      QLOG_ERROR() << "Warning! Ignoring recursive fullscreen change request.";
-    }
-    else
-    {
-      InputComponent::Get().cancelAutoRepeat();
-      updateWindowState();
-    }
+    InputComponent::Get().cancelAutoRepeat();
+    updateWindowState();
   }
 
   if (values.contains("webMode"))
@@ -361,8 +351,6 @@ void KonvergoWindow::updateMainSectionSettings(const QVariantMap& values)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 void KonvergoWindow::updateWindowState(bool saveGeo)
 {
-  m_resizeHack->start(1000);
-
   if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool() || SystemComponent::Get().isOpenELEC())
   {
     // if we were go from windowed to fullscreen

+ 0 - 2
src/ui/KonvergoWindow.h

@@ -160,8 +160,6 @@ private:
 
   unsigned long m_osxPresentationOptions;
 
-  QTimer* m_resizeHack;
-
   void setWebMode(bool newDesktopMode, bool fullscreen);
 };