MythBrowser: let the MythUIWebBrowser set the correct zoom

MythTV · Jun 6, 2013 · 69af144 · 69af144
1 parent de31679
commit 69af144
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
@@ -385,7 +385,7 @@ void BookmarkManager::slotBookmarkClicked(MythUIButtonListItem *item)
         if (urls[0].startsWith("mythflash://"))
             mythbrowser = new MythFlashPlayer(mainStack, urls);
         else
-            mythbrowser = new MythBrowser(mainStack, urls, zoom.toFloat());
+            mythbrowser = new MythBrowser(mainStack, urls);
 
         if (mythbrowser->Create())
         {
@@ -605,7 +605,7 @@ void BookmarkManager::slotShowMarked(void)
     {
         MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
-        MythBrowser *mythbrowser = new MythBrowser(mainStack, urls, zoom.toFloat());
+        MythBrowser *mythbrowser = new MythBrowser(mainStack, urls);
 
         if (mythbrowser->Create())
         {

diff --git a/mythplugins/mythbrowser/mythbrowser/main.cpp b/mythplugins/mythbrowser/mythbrowser/main.cpp
@@ -30,7 +30,6 @@ static int handleMedia(const QString &url, const QString &directory, const QStri
     }
 
     QStringList urls = url.split(" ", QString::SkipEmptyParts);
-    float zoom = gCoreContext->GetSetting("WebBrowserZoomLevel", "1.0").toFloat();
 
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
@@ -44,7 +43,7 @@ static int handleMedia(const QString &url, const QString &directory, const QStri
     }
     else
     {
-        MythBrowser *mythbrowser = new MythBrowser(mainStack, urls, zoom);
+        MythBrowser *mythbrowser = new MythBrowser(mainStack, urls);
 
         if (!directory.isEmpty())
             mythbrowser->setDefaultSaveDirectory(directory);

diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp b/mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
@@ -18,15 +18,14 @@
 
 using namespace std;
 
-MythBrowser::MythBrowser(MythScreenStack *parent,
-                         QStringList &urlList, float zoom)
+MythBrowser::MythBrowser(MythScreenStack *parent, QStringList &urlList)
     : MythScreenType (parent, "mythbrowser"),
       m_urlList(urlList),   m_pageList(NULL),
       m_progressBar(NULL),  m_titleText(NULL),
       m_statusText(NULL),   m_backButton(NULL),
       m_forwardButton(NULL),  m_exitButton(NULL),
-      m_currentBrowser(-1), m_zoom(zoom),
-      m_menuPopup(NULL),    m_defaultFavIcon(NULL)
+      m_currentBrowser(-1),   m_menuPopup(NULL),
+      m_defaultFavIcon(NULL)
 {
     GetMythMainWindow()->PauseIdleTimer(true);
 }
@@ -86,7 +85,6 @@ bool MythBrowser::Create(void)
     WebPage *page = new WebPage(this, browser);
 
     m_browserList.append(page);
-    page->getBrowser()->SetZoom(m_zoom);
     page->getBrowser()->SetDefaultSaveDirectory(m_defaultSaveDir);
     page->getBrowser()->SetDefaultSaveFilename(m_defaultSaveFilename);
 
@@ -164,8 +162,6 @@ void MythBrowser::slotAddTab(const QString &url, bool doSwitch)
     QString name = QString("browser%1").arg(m_browserList.size() + 1);
     WebPage *page = new WebPage(this, m_browserList[0]->getBrowser()->GetArea(),
                                 name.toAscii().constData());
-    page->getBrowser()->SetZoom(m_zoom);
-
     m_browserList.append(page);
 
     QString newUrl = url;

diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.h b/mythplugins/mythbrowser/mythbrowser/mythbrowser.h
@@ -19,8 +19,7 @@ class MythBrowser : public MythScreenType
   Q_OBJECT
 
   public:
-    MythBrowser(MythScreenStack *parent,
-           QStringList &urlList, float zoom);
+    MythBrowser(MythScreenStack *parent, QStringList &urlList);
     ~MythBrowser();
 
     bool Create(void);
@@ -79,7 +78,6 @@ class MythBrowser : public MythScreenType
 
     int       m_currentBrowser;
     QUrl      m_url;
-    float     m_zoom;
     QString   m_defaultSaveDir;
     QString   m_defaultSaveFilename;