hrev50155 adds 4 changesets to branch 'master'
old head: 1da0fe09b698262845c47a6fdc5c24b8bb3bf738
new head: 3c1bde87b6f45def4a5872cb470816e288d4d517
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=3c1bde87b6f4+%5E1da0fe09b698
----------------------------------------------------------------------------
a99b9010f869: BWindow: Reorder includes
2ab6ca298a77: BWindow: Style fixes
105a543e3d5d: BWindow: Rename string to bytes
3c1bde87b6f4: WebPostive: Tiny style fix
new lines between case statements that don't fall-through
I'm sorry for the noise. I just wanted to get rid of these very old commits.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 24 insertions(+), 23 deletions(-)
src/apps/webpositive/BrowserWindow.cpp | 2 ++
src/kits/interface/Window.cpp | 45 +++++++++++++++---------------
############################################################################
Commit: a99b9010f869312706c55e00a7f2d3a6a07a1387
URL: http://cgit.haiku-os.org/haiku/commit/?id=a99b9010f869
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 17 22:18:14 2016 UTC
BWindow: Reorder includes
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index d847f3d..d8cac1f 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -18,41 +18,41 @@
#include <stdlib.h>
#include <Application.h>
+#include <AppMisc.h>
+#include <AppServerLink.h>
+#include <ApplicationPrivate.h>
#include <Autolock.h>
#include <Bitmap.h>
#include <Button.h>
+#include <DirectMessageTarget.h>
#include <FindDirectory.h>
+#include <InputServerTypes.h>
#include <Layout.h>
#include <LayoutUtils.h>
#include <MenuBar.h>
#include <MenuItem.h>
+#include <MenuPrivate.h>
+#include <MessagePrivate.h>
#include <MessageQueue.h>
#include <MessageRunner.h>
#include <Path.h>
+#include <PortLink.h>
#include <PropertyInfo.h>
#include <Roster.h>
+#include <RosterPrivate.h>
#include <Screen.h>
+#include <ServerProtocol.h>
#include <String.h>
+#include <TextView.h>
+#include <TokenSpace.h>
+#include <ToolTipManager.h>
+#include <ToolTipWindow.h>
#include <UnicodeChar.h>
+#include <WindowPrivate.h>
-#include <AppMisc.h>
-#include <AppServerLink.h>
-#include <ApplicationPrivate.h>
#include <binary_compatibility/Interface.h>
-#include <DirectMessageTarget.h>
#include <input_globals.h>
-#include <InputServerTypes.h>
-#include <MenuPrivate.h>
-#include <MessagePrivate.h>
-#include <PortLink.h>
-#include <RosterPrivate.h>
-#include <ServerProtocol.h>
-#include <ServerProtocolStructs.h>
-#include <TokenSpace.h>
-#include <ToolTipManager.h>
-#include <ToolTipWindow.h>
#include <tracker_private.h>
-#include <WindowPrivate.h>
//#define DEBUG_WIN
############################################################################
Commit: 2ab6ca298a7757d8922cde27f915d72d22f2dadb
URL: http://cgit.haiku-os.org/haiku/commit/?id=2ab6ca298a77
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 17 22:19:32 2016 UTC
BWindow: Style fixes
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index d8cac1f..15065cf 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -3731,7 +3731,8 @@ BWindow::_HandleKeyDown(BMessage* event)
modifiers = 0;
// handle BMenuBar key
- if (key == B_ESCAPE && (modifiers & B_COMMAND_KEY) != 0 && fKeyMenuBar)
{
+ if (key == B_ESCAPE && (modifiers & B_COMMAND_KEY) != 0
+ && fKeyMenuBar != NULL) {
fKeyMenuBar->StartMenuBar(0, true, false, NULL);
return true;
}
@@ -3883,8 +3884,7 @@ BWindow::_KeyboardNavigation()
const char* bytes;
uint32 modifiers;
- if (message->FindString("bytes", &bytes) != B_OK
- || bytes[0] != B_TAB)
+ if (message->FindString("bytes", &bytes) != B_OK || bytes[0] != B_TAB)
return;
message->FindInt32("modifiers", (int32*)&modifiers);
@@ -3897,9 +3897,8 @@ BWindow::_KeyboardNavigation()
else
nextFocus = _FindNextNavigable(fFocus, jumpGroups);
- if (nextFocus && nextFocus != fFocus) {
+ if (nextFocus != NULL && nextFocus != fFocus)
nextFocus->MakeFocus(true);
- }
}
############################################################################
Commit: 105a543e3d5dbb20d00673a8adc5e6f884f14dd3
URL: http://cgit.haiku-os.org/haiku/commit/?id=105a543e3d5d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 17 22:19:45 2016 UTC
BWindow: Rename string to bytes
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 15065cf..c1abc1b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -3720,11 +3720,11 @@ BWindow::_HandleKeyDown(BMessage* event)
if (!_IsFocusMessage(event))
return false;
- const char* string = NULL;
- if (event->FindString("bytes", &string) != B_OK)
+ const char* bytes = NULL;
+ if (event->FindString("bytes", &bytes) != B_OK)
return false;
- char key = string[0];
+ char key = bytes[0];
uint32 modifiers;
if (event->FindInt32("modifiers", (int32*)&modifiers) != B_OK)
############################################################################
Revision: hrev50155
Commit: 3c1bde87b6f45def4a5872cb470816e288d4d517
URL: http://cgit.haiku-os.org/haiku/commit/?id=3c1bde87b6f4
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Mar 17 22:20:33 2016 UTC
WebPostive: Tiny style fix
new lines between case statements that don't fall-through
I'm sorry for the noise. I just wanted to get rid of these very old commits.
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/BrowserWindow.cpp
b/src/apps/webpositive/BrowserWindow.cpp
index a251b40..4f0afdd 100644
--- a/src/apps/webpositive/BrowserWindow.cpp
+++ b/src/apps/webpositive/BrowserWindow.cpp
@@ -729,9 +729,11 @@ BrowserWindow::DispatchMessage(BMessage* message,
BHandler* target)
case B_F5_KEY:
PostMessage(RELOAD);
break;
+
case B_F11_KEY:
PostMessage(TOGGLE_FULLSCREEN);
break;
+
default:
break;
}
