i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly set the download listener on new tabs. This fixes the Downloads window

Browse Source 
not popping up for subsequent tabs.


git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@192 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2010-02-24 10:34:53 +00:00
parent 57b6a0fc1b
commit d54c477ad1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/LauncherWindow.cpp
+3 -1
View File
@@ -94,6 +94,7 @@ LauncherWindow::LauncherWindow(BRect frame, const BMessenger& downloadListener,
: WebViewWindow(frame, "HaikuLauncher", : WebViewWindow(frame, "HaikuLauncher",
B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS) B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS)
, m_downloadListener(downloadListener)
{ {
m_tabView = new WebTabView("tabview", BMessenger(this)); m_tabView = new WebTabView("tabview", BMessenger(this));
m_tabView->setTarget(BMessenger(this)); m_tabView->setTarget(BMessenger(this));
@@ -228,7 +229,6 @@ LauncherWindow::LauncherWindow(BRect frame, const BMessenger& downloadListener,
} }
newTab("", true); newTab("", true);
currentWebView()->WebPage()->SetDownloadListener(downloadListener);
m_findGroup->SetVisible(false); m_findGroup->SetVisible(false);
@@ -410,6 +410,8 @@ void LauncherWindow::newTab(const BString& url, bool select)
{ {
// Executed in app thread (new BWebPage needs to be created in app thread). // Executed in app thread (new BWebPage needs to be created in app thread).
BWebView* webView = new BWebView("web_view"); BWebView* webView = new BWebView("web_view");
webView->WebPage()->SetDownloadListener(m_downloadListener);
m_tabView->AddTab(webView); m_tabView->AddTab(webView);
m_tabView->TabAt(m_tabView->CountTabs() - 1)->SetLabel("New tab"); m_tabView->TabAt(m_tabView->CountTabs() - 1)->SetLabel("New tab");
// TODO: Remove when BTabView is fixed... // TODO: Remove when BTabView is fixed...
src/apps/webpositive/LauncherWindow.h
+2
View File
@@ -31,6 +31,7 @@
#define LauncherWindow_h #define LauncherWindow_h
#include "WebViewWindow.h" #include "WebViewWindow.h"
#include <Messenger.h>
#include <String.h> #include <String.h>
class BButton; class BButton;
@@ -92,6 +93,7 @@ private:
void updateTitle(const BString &title); void updateTitle(const BString &title);
private: private:
BMessenger m_downloadListener;
BMenuBar* m_menuBar; BMenuBar* m_menuBar;
BMenu* m_goMenu; BMenu* m_goMenu;
IconButton* m_BackButton; IconButton* m_BackButton;