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

WebPositive: Style fixes, 80 char limit and ws

Browse Source
This commit is contained in:
John Scipione
2014-01-30 19:48:33 -05:00
parent 9f7f92dd7f
commit 741987bed7
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BrowserWindow.cpp
+24 -6
View File
@@ -701,6 +701,7 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
return;
}
}
if (message->what == B_MOUSE_MOVED || message->what == B_MOUSE_DOWN
|| message->what == B_MOUSE_UP) {
message->FindPoint("where", &fLastMousePos);
@@ -708,6 +709,7 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
fLastMouseMovedTime = system_time();
_CheckAutoHideInterface();
}
if (message->what == B_MOUSE_WHEEL_CHANGED) {
BPoint where;
uint32 buttons;
@@ -729,9 +731,13 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
return;
}
}
} else // Also don't scroll up and down if the mouse is not over the web view
} else {
// Also don't scroll up and down if the mouse is not over the
// web view
return;
}
}
BWebWindow::DispatchMessage(message, target);
}
@@ -747,9 +753,11 @@ BrowserWindow::MessageReceived(BMessage* message)
else
fURLInputGroup->MakeFocus(true);
break;
case RELOAD:
CurrentWebView()->Reload();
break;
case GOTO_URL:
{
BString url;
@@ -761,15 +769,19 @@ BrowserWindow::MessageReceived(BMessage* message)
break;
}
case GO_BACK:
CurrentWebView()->GoBack();
break;
case GO_FORWARD:
CurrentWebView()->GoForward();
break;
case STOP:
CurrentWebView()->StopLoading();
break;
case HOME:
CurrentWebView()->LoadURL(fStartPageURL);
break;
@@ -792,13 +804,15 @@ BrowserWindow::MessageReceived(BMessage* message)
case CREATE_BOOKMARK:
_CreateBookmark();
break;
case SHOW_BOOKMARKS:
_ShowBookmarks();
break;
case B_REFS_RECEIVED:
{
// Currently the only source of these messages is the bookmarks menu.
// Currently the only source of these messages is the bookmarks
// menu.
// Filter refs into URLs, this also gets rid of refs for folders.
// For clicks on sub-folders in the bookmarks menu, we have Tracker
// open the corresponding folder.
@@ -830,12 +844,15 @@ BrowserWindow::MessageReceived(BMessage* message)
}
message->RemoveName("refs");
if (addedCount > 10) {
BString string(B_TRANSLATE_COMMENT("Do you want to open %addedCount "
"bookmarks all at once?", "Don't translate variable %addedCount."));
BString string(B_TRANSLATE_COMMENT("Do you want to open "
"%addedCount bookmarks all at once?", "Don't translate "
"variable %addedCount."));
string.ReplaceFirst("%addedCount", BString() << addedCount);
BAlert* alert = new BAlert(B_TRANSLATE("Open bookmarks confirmation"),
string.String(), B_TRANSLATE("Cancel"), B_TRANSLATE("Open all"));
BAlert* alert = new BAlert(
B_TRANSLATE("Open bookmarks confirmation"),
string.String(), B_TRANSLATE("Cancel"),
B_TRANSLATE("Open all"));
alert->SetShortcut(0, B_ESCAPE);
if (alert->Go() == 0)
break;
@@ -844,6 +861,7 @@ BrowserWindow::MessageReceived(BMessage* message)
be_app->PostMessage(message);
break;
}
case B_SIMPLE_DATA:
{
// User possibly dropped files on this window.
src/apps/webpositive/URLInputGroup.cpp
+1
View File
@@ -202,6 +202,7 @@ URLInputGroup::URLTextView::MessageReceived(BMessage* message)
case MSG_CLEAR:
SetText("");
break;
default:
BTextView::MessageReceived(message);
break;