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

The favicon is now also displayed in the URL input view. Mostly because one is

Browse Source 
used to it, but also when only one page is open and tabs are not displayed as
per the user settings, the favicon would then not be visible.

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@465 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2012-07-03 15:43:41 +02:00
committed by Alexandre Deckner
parent 50c66f3857
commit 65cc5e49ee
3 changed files with 103 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BrowserWindow.cpp
+10 -2
View File
@@ -1174,8 +1174,14 @@ BrowserWindow::_TabChanged(int32 index)
// Restore the previous focus or focus the web view.
PageUserData* userData = static_cast<PageUserData*>(
webView->GetUserData());
if (userData != NULL && userData->FocusedView() != NULL)
userData->FocusedView()->MakeFocus(true);
BView* focusedView = NULL;
if (userData != NULL) {
focusedView = userData->FocusedView();
fURLInputGroup->SetPageIcon(userData->PageIcon());
}
if (focusedView != NULL)
focusedView->MakeFocus(true);
else
webView->MakeFocus(true);
@@ -1443,6 +1449,8 @@ BrowserWindow::_SetPageIcon(BWebView* view, const BBitmap* icon)
// the TabManager for display in the respective tab.
userData->SetPageIcon(icon);
fTabManager->SetTabIcon(view, userData->PageIcon());
if (view == CurrentWebView())
fURLInputGroup->SetPageIcon(icon);
}