[gtk] tab in omnibox

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 495 matching lines @@
 #if GTK_CHECK_VERSION(2, 20, 0)
   // We need to treat the text currently being composed by the input method as
   // part of the text content, so that omnibox can work correctly in the middle
   // of composition.
   if (preedit_.size()) {
     GtkTextMark* mark = gtk_text_buffer_get_insert(text_buffer_);
     gtk_text_buffer_get_iter_at_mark(text_buffer_, &start, mark);
     out.insert(gtk_text_iter_get_offset(&start), preedit_);
   }
 #endif
+
   return out;
 }
 
 bool AutocompleteEditViewGtk::IsEditingOrEmpty() const {
   return model_->user_input_in_progress() || (GetTextLength() == 0);
 }
 
 int AutocompleteEditViewGtk::GetIcon() const {
   return IsEditingOrEmpty() ?
       AutocompleteMatch::TypeToIcon(model_->CurrentTextType()) :
@@ skipping 852 matching lines @@
   // of the text. Delete the selected keyword.
   model_->ClearKeyword(GetText());
 
   // Stop propagating the signal emission into GtkTextView.
   static guint signal_id = g_signal_lookup("backspace", GTK_TYPE_TEXT_VIEW);
   g_signal_stop_emission(text_view_, signal_id, 0);
 }
 
 void AutocompleteEditViewGtk::HandleViewMoveFocus(GtkWidget* widget,
                                                   GtkDirectionType direction) {
+  if (!tab_was_pressed_)
+    return;
+
+  // If special behavior is triggered, then stop the signal emission to
+  // prevent the focus from being moved.
+  bool handled = false;
+
   // Trigger Tab to search behavior only when Tab key is pressed.
-  if (tab_was_pressed_ && enable_tab_to_search_ &&
-      model_->is_keyword_hint() && !model_->keyword().empty()) {
-    model_->AcceptKeyword();
+  if (model_->is_keyword_hint() && !model_->keyword().empty()) {
+    if (enable_tab_to_search_) {
+      model_->AcceptKeyword();
+      handled = true;
+    }
+  } else {
+    if (GTK_WIDGET_VISIBLE(instant_view_))
+      controller_->OnCommitSuggestedText(GetText());
+    else
+      controller_->AcceptCurrentInstantPreview();
 
-    // If Tab to search behavior is triggered, then stop the signal emission to
-    // prevent the focus from being moved.
+    handled = true;

[James Su, 2010/12/01 02:18:33]

Should handled always be set to true here? Looks like it breaks moving focus by
pressing tab.

[Evan Stade, 2010/12/01 04:00:58]

thanks for pointing that out. Fixed. I also fixed "shift-tab" being counted as a
tab (both for this and TTS)

+  }
+
+  if (handled) {
     static guint signal_id = g_signal_lookup("move-focus", GTK_TYPE_WIDGET);
     g_signal_stop_emission(widget, signal_id, 0);
   }
-
-  // Propagate the signal so that focus can be moved as normal.
 }
 
 void AutocompleteEditViewGtk::HandleCopyClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(true);
 }
 
 void AutocompleteEditViewGtk::HandleCutClipboard(GtkWidget* sender) {
   HandleCopyOrCutClipboard(false);
 }
 
@@ skipping 548 matching lines @@
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   PangoLayoutIter* iter = pango_layout_get_iter(layout);
   int baseline = pango_layout_iter_get_baseline(iter);
   pango_layout_iter_free(iter);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }