[haiku-commits] haiku: hrev47196 - src/kits/interface
- From: jessica.l.hamilton@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 3 May 2014 00:07:40 +0200 (CEST)
hrev47196 adds 1 changeset to branch 'master'
old head: 77b60d2222904e326718bf0f1e57efc7cd42ada7
new head: 24a8416ea70ea7898a281090210f1314ce149e06
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=24a8416+%5E77b60d2
----------------------------------------------------------------------------
24a8416: Revert "Fix window behavior when default button is present"
With some testing, found that even with the second patch
provided in #10792, the behaviour is still inconsistent, so
reverting for now.
This reverts commit 273109e0048442ba5f6361d6e683e5b4a69a472b.
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47196
Commit: 24a8416ea70ea7898a281090210f1314ce149e06
URL: http://cgit.haiku-os.org/haiku/commit/?id=24a8416
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Fri May 2 22:01:49 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10792
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 4 deletions(-)
src/kits/interface/Window.cpp | 6 ++----
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index f315dac..f23681f 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2014, Haiku.
+ * Copyright 2001-2011, Haiku.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -3287,11 +3287,9 @@ BWindow::_DetermineTarget(BMessage* message, BHandler*
target)
case B_KEY_UP:
{
// if we have a default button, it might want to hear
- // about pressing the <enter> key, but it shouldn't
- // intercept it if another BControl is focused
+ // about pressing the <enter> key
int32 rawChar;
if (DefaultButton() != NULL
- && dynamic_cast<BControl*>(CurrentFocus()) ==
NULL
&& message->FindInt32("raw_char", &rawChar) ==
B_OK
&& rawChar == B_ENTER)
return DefaultButton();
Other related posts:
- » [haiku-commits] haiku: hrev47196 - src/kits/interface - jessica . l . hamilton
