diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 15:41:09 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 15:41:09 +0000 |
| commit | 59461d2076ab5bbe6274d07d7e7855643f64862c (patch) | |
| tree | d2da836b8b24b851d399433720312ea0d6548f9b /views/controls/menu | |
| parent | 8ea4b5e6df7865892a40fbe304e44d67a34b8e46 (diff) | |
| download | chromium_src-59461d2076ab5bbe6274d07d7e7855643f64862c.zip chromium_src-59461d2076ab5bbe6274d07d7e7855643f64862c.tar.gz chromium_src-59461d2076ab5bbe6274d07d7e7855643f64862c.tar.bz2 | |
Fixes regression in links ending up too small. The problem is that we
changed IsFocusable to check IsVisibleInRootView. This meant that any
views (like label) whose preferred size takes into account focusable
and cached the preferred size before they were visible in the root
view would end up with the wrong size because they didn't recalculate
when IsVisibleInRootView changed.
I've separated out the two states so that IsFocusable no longer checks
IsVisibleInRootView and is protected. All consumers now call
IsFocusableInRootView which checks IsFocusable and
IsVisibleInRootView.
BUG=49635
TEST=see bug.
Review URL: http://codereview.chromium.org/3046008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 3375a6e..21a7708 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -91,7 +91,7 @@ static View* GetFirstFocusableView(View* view, int start, bool forward) { return deepest; } } - return view->IsFocusable() ? view : NULL; + return view->IsFocusableInRootView() ? view : NULL; } // Returns the first child of |start| that is focusable. |