Hide autocomplete popup when IME candidate window is open (on Windows).

chrome/browser/ui/views/omnibox/omnibox_view_win.cc

 // Copyright (c) 2011 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/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 401 matching lines @@
       tracking_double_click_(false),
       double_click_time_(0),
       can_discard_mousemove_(false),
       ignore_ime_messages_(false),
       delete_at_end_pressed_(false),
       font_(font),
       possible_drag_(false),
       in_drag_(false),
       initiated_drag_(false),
       drop_highlight_position_(-1),
+      ime_candidate_window_open_(false),
       background_color_(skia::SkColorToCOLORREF(LocationBarView::GetColor(
           ToolbarModel::NONE, LocationBarView::BACKGROUND))),
       security_level_(ToolbarModel::NONE),
       text_object_model_(NULL) {
   // Dummy call to a function exported by riched20.dll to ensure it sets up an
   // import dependency on the dll.
   CreateTextServices(NULL, NULL, NULL);
 
   saved_selection_for_focus_change_.cpMin = -1;
 
@@ skipping 254 matching lines @@
   ClosePopup();
   model_->Revert();
   saved_selection_for_focus_change_.cpMin = -1;
   TextChanged();
 }
 
 void OmniboxViewWin::UpdatePopup() {
   ScopedFreeze freeze(this, GetTextObjectModel());
   model_->SetInputInProgress(true);
 
+  if (ime_candidate_window_open_) {
+    // Don't allow the popup to overlap with the candidate window.

[Peter Kasting, 2011/10/24 21:43:06]

Nit: Hoist this comment above the conditional and remove the {}.

[falken, 2011/10/25 06:19:23]

Done.

+    return;

[falken, 2011/10/20 11:06:53]

I'm not sure whether this return should be above the ScopedFreeze.  The comment
for the early return below mentions that the ScopedFreeze was unnecessary, but
it seems there is a reason for the order of freeze, set input in progress,
return.

[Peter Kasting, 2011/10/24 21:43:06]

It probably should be where you have it, but do you need this at all?  Is
UpdatePopup() ever called while the candidate window is open?  Or can you
eliminate this code and your new member variable entirely?

[falken, 2011/10/25 06:19:23]

Yes, it gets called as you change selection in the candidate window.  When the
selected candidate changes, the pre-edit text changes which triggers
UpdatePopup.

+  }
+
   if (!model_->has_focus()) {
     // When we're in the midst of losing focus, don't rerun autocomplete.  This
     // can happen when losing focus causes the IME to cancel/finalize a
     // composition.  We still want to note that user input is in progress, we
     // just don't want to do anything else.
     //
     // Note that in this case the ScopedFreeze above was unnecessary; however,
     // we're inside the callstack of OnKillFocus(), which has already frozen the
     // edit, so this will never result in an unnecessary UpdateWindow() call.
     return;
@@ skipping 657 matching lines @@
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   LRESULT result = DefWindowProc(message, wparam, lparam);
   // Force an IME composition confirmation operation to trigger the text_changed
   // code in OnAfterPossibleChange(), even if identical contents are confirmed,
   // to make sure the model can update its internal states correctly.
   OnAfterPossibleChangeInternal((lparam & GCS_RESULTSTR) != 0);
   return result;
 }
 
+LRESULT OmniboxViewWin::OnImeNotify(UINT message,
+                                    WPARAM wparam,
+                                    LPARAM lparam) {
+  // Close the popup when the IME composition window is open, so they don't
+  // overlap.
+  switch (wparam) {
+    case IMN_OPENCANDIDATE:
+      ime_candidate_window_open_ = true;
+      ClosePopup();
+      break;
+    case IMN_CLOSECANDIDATE:
+      ime_candidate_window_open_ = false;
+      UpdatePopup();
+      break;
+    default:
+      break;
+  }
+  return DefWindowProc(message, wparam, lparam);
+}
+
 void OmniboxViewWin::OnKeyDown(TCHAR key,
                                UINT repeat_count,
                                UINT flags) {
   delete_at_end_pressed_ = false;
 
   if (OnKeyDownAllModes(key, repeat_count, flags))
     return;
 
   // Make sure that we handle system key events like Alt-F4.
   if (popup_window_mode_) {
@@ skipping 1229 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool OmniboxViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }