[haiku-commits] haiku: hrev47119 - src/apps/webpositive build/jam
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 15 Apr 2014 09:18:14 +0200 (CEST)
hrev47119 adds 2 changesets to branch 'master'
old head: 8df3fb70356467f638ead86ea316cb46d93cca8f
new head: 840839b546f4d2900fd550b9491c4a47842ff7c4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=840839b+%5E8df3fb7
----------------------------------------------------------------------------
3eff063: WebPositive: let escape close the menu.
* Intercept the escape key to mean "stop loading" only when menus are
closed.
840839b: In jam, unset variables aren't equal to 0
Make our Werror check work again with gcc.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 13 insertions(+), 2 deletions(-)
build/jam/ArchitectureRules | 2 +-
src/apps/webpositive/BrowserWindow.cpp | 11 ++++++++++-
src/apps/webpositive/BrowserWindow.h | 2 ++
############################################################################
Commit: 3eff0639587e0d76467a900872bc7f4897d49120
URL: http://cgit.haiku-os.org/haiku/commit/?id=3eff063
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Mon Apr 14 13:54:33 2014 UTC
WebPositive: let escape close the menu.
* Intercept the escape key to mean "stop loading" only when menus are
closed.
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/BrowserWindow.cpp
b/src/apps/webpositive/BrowserWindow.cpp
index 7993691..4ce93f9 100644
--- a/src/apps/webpositive/BrowserWindow.cpp
+++ b/src/apps/webpositive/BrowserWindow.cpp
@@ -334,6 +334,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage*
appSettings,
B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS),
fIsFullscreen(false),
fInterfaceVisible(false),
+ fMenusRunning(false),
fPulseRunner(NULL),
fVisibleInterfaceElements(interfaceElements),
fContext(context),
@@ -707,7 +708,7 @@ BrowserWindow::DispatchMessage(BMessage* message, BHandler*
target)
_InvokeButtonVisibly(fFindCloseButton);
return;
}
- } else if (bytes[0] == B_ESCAPE) {
+ } else if (bytes[0] == B_ESCAPE && !fMenusRunning) {
if (modifierKeys == B_COMMAND_KEY)
_ShowInterface(true);
else {
@@ -1125,6 +1126,14 @@ BrowserWindow::MenusBeginning()
{
_UpdateHistoryMenu();
_UpdateClipboardItems();
+ fMenusRunning = true;
+}
+
+
+void
+BrowserWindow::MenusEnded()
+{
+ fMenusRunning = false;
}
diff --git a/src/apps/webpositive/BrowserWindow.h
b/src/apps/webpositive/BrowserWindow.h
index 8b2093a..a2d228f 100644
--- a/src/apps/webpositive/BrowserWindow.h
+++ b/src/apps/webpositive/BrowserWindow.h
@@ -103,6 +103,7 @@ public:
virtual void MessageReceived(BMessage*
message);
virtual bool QuitRequested();
virtual void MenusBeginning();
+ virtual void MenusEnded();
virtual void ScreenChanged(BRect screenSize,
color_space format);
@@ -246,6 +247,7 @@ private:
bool fIsFullscreen;
bool fInterfaceVisible;
+ bool fMenusRunning;
BRect
fNonFullscreenWindowFrame;
BMessageRunner* fPulseRunner;
uint32
fVisibleInterfaceElements;
############################################################################
Revision: hrev47119
Commit: 840839b546f4d2900fd550b9491c4a47842ff7c4
URL: http://cgit.haiku-os.org/haiku/commit/?id=840839b
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Apr 15 07:15:53 2014 UTC
In jam, unset variables aren't equal to 0
Make our Werror check work again with gcc.
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 7a0cd9a..346b901 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -498,7 +498,7 @@ rule ArchitectureSetupWarnings architecture
rule EnableWerror dirTokens : scope {
# Clang gives way more warnings than GCC, so that code won't
compile
# -Werror when using Clang.
- if $(HAIKU_CC_IS_CLANG_$(architecture)) = 0 {
+ if $(HAIKU_CC_IS_CLANG_$(architecture)) != 1 {
SetConfigVar WARNINGS : HAIKU_TOP $(dirTokens) :
treatAsErrors
: $(scope) ;
}
Other related posts:
