Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix why escape wasn't closing the find panel as expected (#75). 

Fix fullscreen icon layout spacing issue (#76).

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@576 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
phoudoin 2011-03-02 18:15:57 +00:00 committed by Alexandre Deckner
parent 552778e90c
commit 1ef6069fe4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/webpositive/BrowserWindow.cpp
View File

@ -466,11 +466,11 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
new BMessage(TOGGLE_FULLSCREEN)); new BMessage(TOGGLE_FULLSCREEN));
toggleFullscreenButton->SetBackgroundMode(BitmapButton::MENUBAR_BACKGROUND); toggleFullscreenButton->SetBackgroundMode(BitmapButton::MENUBAR_BACKGROUND);
BGroupLayout* menuBarGroup = BLayoutBuilder::Group<>(B_HORIZONTAL) BGroupLayout* menuBarGroup = BLayoutBuilder::Group<>(B_HORIZONTAL, 0.0)
.Add(mainMenu) .Add(mainMenu)
.Add(toggleFullscreenButton, 0.0f) .Add(toggleFullscreenButton, 0.0f)
; ;
// Layout // Layout
AddChild(BLayoutBuilder::Group<>(B_VERTICAL, 0.0) AddChild(BLayoutBuilder::Group<>(B_VERTICAL, 0.0)
#if !INTEGRATE_MENU_INTO_TAB_BAR #if !INTEGRATE_MENU_INTO_TAB_BAR
@ -488,7 +488,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
mainMenu->SetViewColor(B_TRANSPARENT_COLOR); mainMenu->SetViewColor(B_TRANSPARENT_COLOR);
fURLInputGroup->MakeFocus(true); fURLInputGroup->MakeFocus(true);
fMenuGroup = menuBarGroup; fMenuGroup = menuBarGroup;
fTabGroup = fTabManager->TabGroup()->GetLayout(); fTabGroup = fTabManager->TabGroup()->GetLayout();
fNavigationGroup = navigationGroup; fNavigationGroup = navigationGroup;
@ -547,13 +547,6 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
} else if (bytes[0] == B_RIGHT_ARROW && modifierKeys == B_COMMAND_KEY) { } else if (bytes[0] == B_RIGHT_ARROW && modifierKeys == B_COMMAND_KEY) {
PostMessage(GO_FORWARD); PostMessage(GO_FORWARD);
return; return;
} else if (bytes[0] == B_ESCAPE) {
// Let the URL input handle escape when it is the target
if (target != fURLInputGroup->TextView()) {
// Otherwise do a stop
PostMessage(STOP);
return;
}
} else if (bytes[0] == B_FUNCTION_KEY) { } else if (bytes[0] == B_FUNCTION_KEY) {
// Some function key Firefox compatibility // Some function key Firefox compatibility
int32 key; int32 key;
@ -591,6 +584,10 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler* target)
_InvokeButtonVisibly(fFindCloseButton); _InvokeButtonVisibly(fFindCloseButton);
return; return;
} }
} else if (bytes[0] == B_ESCAPE) {
// Default escape key behavior:
PostMessage(STOP);
return;
} }
} }
if (message->what == B_MOUSE_MOVED || message->what == B_MOUSE_DOWN if (message->what == B_MOUSE_MOVED || message->what == B_MOUSE_DOWN