summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--views/controls/button/button.cc1
-rw-r--r--views/controls/button/native_button.cc2
-rw-r--r--views/controls/button/text_button.cc1
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_gtk.cc15
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_gtk.h7
-rw-r--r--views/focus/focus_manager_gtk.cc11
-rw-r--r--views/view.cc6
-rw-r--r--views/widget/widget_gtk.cc38
-rw-r--r--views/widget/widget_gtk.h20
-rw-r--r--views/window/custom_frame_view.cc7
10 files changed, 8 insertions, 100 deletions
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index 460c424..504a2f5 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -64,7 +64,6 @@ Button::Button(ButtonListener* listener)
: listener_(listener),
tag_(-1),
mouse_event_flags_(0) {
- SetFocusable(true);
}
void Button::NotifyClick(const views::Event& event) {
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 76fb0ff..811fb56 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -36,6 +36,7 @@ NativeButton::NativeButton(ButtonListener* listener)
is_default_(false),
ignore_minimum_size_(false) {
InitBorder();
+ SetFocusable(true);
}
NativeButton::NativeButton(ButtonListener* listener, const std::wstring& label)
@@ -45,6 +46,7 @@ NativeButton::NativeButton(ButtonListener* listener, const std::wstring& label)
ignore_minimum_size_(false) {
SetLabel(label); // SetLabel takes care of label layout in RTL UI.
InitBorder();
+ SetFocusable(true);
}
NativeButton::~NativeButton() {
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 6bb3bec..b5733c0 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -330,7 +330,6 @@ void TextButton::SetEnabled(bool enabled) {
}
bool TextButton::OnMousePressed(const MouseEvent& e) {
- RequestFocus();
return true;
}
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 96e26df..6516c42 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -119,13 +119,6 @@ void NativeTabbedPaneGtk::CreateNativeControl() {
}
////////////////////////////////////////////////////////////////////////////////
-// NativeTabbedPaneGtk, View override:
-
-FocusTraversable* NativeTabbedPaneGtk::GetFocusTraversable() {
- return GetWidgetAt(GetSelectedTabIndex());
-}
-
-////////////////////////////////////////////////////////////////////////////////
// NativeTabbedPaneGtk, private:
void NativeTabbedPaneGtk::DoAddTabAtIndex(int index, const std::wstring& title,
View* contents,
@@ -166,17 +159,11 @@ void NativeTabbedPaneGtk::DoAddTabAtIndex(int index, const std::wstring& title,
gtk_notebook_set_current_page(GTK_NOTEBOOK(native_view()), 0);
}
-WidgetGtk* NativeTabbedPaneGtk::GetWidgetAt(int index) {
+View* NativeTabbedPaneGtk::GetTabViewAt(int index) {
DCHECK(index <= GetTabCount());
GtkWidget* page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(native_view()),
index);
WidgetGtk* widget = WidgetGtk::GetViewForNative(page);
- DCHECK(widget);
- return widget;
-}
-
-View* NativeTabbedPaneGtk::GetTabViewAt(int index) {
- WidgetGtk* widget = GetWidgetAt(index);
DCHECK(widget && widget->GetRootView()->GetChildViewCount() == 1);
return widget->GetRootView()->GetChildViewAt(0);
}
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.h b/views/controls/tabbed_pane/native_tabbed_pane_gtk.h
index d586e74..63a70f7 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.h
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.h
@@ -36,18 +36,11 @@ class NativeTabbedPaneGtk : public NativeControlGtk,
// NativeControlGtk overrides.
virtual void CreateNativeControl();
- // View override:
- virtual FocusTraversable* GetFocusTraversable();
-
private:
void DoAddTabAtIndex(int index,
const std::wstring& title,
View* contents,
bool select_if_first_tab);
-
- // Returns the WidgetGtk containing the tab contents at |index|.
- WidgetGtk* GetWidgetAt(int index);
-
View* GetTabViewAt(int index);
void OnSwitchPage(int selected_tab_index);
diff --git a/views/focus/focus_manager_gtk.cc b/views/focus/focus_manager_gtk.cc
index 3038d93..93b9cb7 100644
--- a/views/focus/focus_manager_gtk.cc
+++ b/views/focus/focus_manager_gtk.cc
@@ -8,20 +8,11 @@
#include "base/logging.h"
#include "views/widget/widget_gtk.h"
-#include "views/window/window_gtk.h"
namespace views {
void FocusManager::ClearNativeFocus() {
- GtkWidget* gtk_widget = widget_->GetNativeView();
- if (!gtk_widget) {
- NOTREACHED();
- return;
- }
-
- // Since only top-level WidgetGtk have a focus manager, the native view is
- // expected to be a GtkWindow.
- gtk_window_set_focus(GTK_WINDOW(gtk_widget), NULL);
+ gtk_widget_grab_focus(widget_->GetNativeView());
}
void FocusManager::FocusNativeView(gfx::NativeView native_view) {
diff --git a/views/view.cc b/views/view.cc
index 3c5d77b..c5db5db 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -277,11 +277,11 @@ bool View::HasFocus() {
}
void View::Focus() {
- // By default, we clear the native focus. This ensures that no visible native
- // view as the focus and that we still receive keyboard inputs.
+ // Set the native focus to the root view window so it receives the keyboard
+ // messages.
FocusManager* focus_manager = GetFocusManager();
if (focus_manager)
- focus_manager->ClearNativeFocus();
+ focus_manager->FocusNativeView(GetRootView()->GetWidget()->GetNativeView());
}
void View::SetHotTracked(bool flag) {
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index fb50103..81c214d 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -490,43 +490,6 @@ void WidgetGtk::DidProcessEvent(GdkEvent* event) {
}
////////////////////////////////////////////////////////////////////////////////
-// FocusTraversable
-
-View* WidgetGtk::FindNextFocusableView(
- View* starting_view, bool reverse, Direction direction,
- bool check_starting_view, FocusTraversable** focus_traversable,
- View** focus_traversable_view) {
- return root_view_->FindNextFocusableView(starting_view,
- reverse,
- direction,
- check_starting_view,
- focus_traversable,
- focus_traversable_view);
-}
-
-FocusTraversable* WidgetGtk::GetFocusTraversableParent() {
- // We are a proxy to the root view, so we should be bypassed when traversing
- // up and as a result this should not be called.
- NOTREACHED();
- return NULL;
-}
-
-void WidgetGtk::SetFocusTraversableParent(FocusTraversable* parent) {
- root_view_->SetFocusTraversableParent(parent);
-}
-
-View* WidgetGtk::GetFocusTraversableParentView() {
- // We are a proxy to the root view, so we should be bypassed when traversing
- // up and as a result this should not be called.
- NOTREACHED();
- return NULL;
-}
-
-void WidgetGtk::SetFocusTraversableParentView(View* parent_view) {
- root_view_->SetFocusTraversableParentView(parent_view);
-}
-
-////////////////////////////////////////////////////////////////////////////////
// TODO(beng): organize into sections:
void WidgetGtk::CreateGtkWidget(GtkWidget* parent, const gfx::Rect& bounds) {
@@ -580,7 +543,6 @@ void WidgetGtk::CreateGtkWidget(GtkWidget* parent, const gfx::Rect& bounds) {
if (transparent_)
ConfigureWidgetForTransparentBackground();
}
-
// The widget needs to be realized before handlers like size-allocate can
// function properly.
gtk_widget_realize(widget_);
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index 080c1a0..7ce3329 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -8,7 +8,6 @@
#include <gtk/gtk.h>
#include "base/message_loop.h"
-#include "views/focus/focus_manager.h"
#include "views/widget/widget.h"
class OSExchangeData;
@@ -27,10 +26,7 @@ class View;
class WindowGtk;
// Widget implementation for GTK.
-class WidgetGtk
- : public Widget,
- public MessageLoopForUI::Observer,
- public FocusTraversable {
+class WidgetGtk : public Widget, public MessageLoopForUI::Observer {
public:
// Type of widget.
enum Type {
@@ -116,20 +112,6 @@ class WidgetGtk
virtual void WillProcessEvent(GdkEvent* event);
virtual void DidProcessEvent(GdkEvent* event);
- // FocusTraversable implementation:
- virtual View* FindNextFocusableView(View* starting_view,
- bool reverse,
- Direction direction,
- bool check_starting_view,
- FocusTraversable** focus_traversable,
- View** focus_traversable_view);
- virtual FocusTraversable* GetFocusTraversableParent();
- virtual View* GetFocusTraversableParentView();
-
- // Sets the focus traversable parents.
- void SetFocusTraversableParent(FocusTraversable* parent);
- void SetFocusTraversableParentView(View* parent_view);
-
// Retrieves the WidgetGtk associated with |widget|.
static WidgetGtk* GetViewForNative(GtkWidget* widget);
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 689b87b..d3fd085 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -86,13 +86,6 @@ CustomFrameView::CustomFrameView(Window* frame)
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- // The frame's buttons should not be focusable.
- close_button_->SetFocusable(false);
- restore_button_->SetFocusable(false);
- maximize_button_->SetFocusable(false);
- minimize_button_->SetFocusable(false);
- system_menu_button_->SetFocusable(false);
-
// Close button images will be set in LayoutWindowControls().
AddChildView(close_button_);
generated by cgit v1.1 at 2025-01-18 23:51:23 +0000