diff options
author | mohsen <mohsen@chromium.org> | 2014-09-04 20:44:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-05 03:45:34 +0000 |
commit | de4a75910d32558f43bc0b0304e58a45d3eea43a (patch) | |
tree | 52505d9f818fff0dcf4f54d65822c0920a85ed9e /athena/home | |
parent | f0728a37c866c9b1a9a31a0938df034af5f7714c (diff) | |
download | chromium_src-de4a75910d32558f43bc0b0304e58a45d3eea43a.zip chromium_src-de4a75910d32558f43bc0b0304e58a45d3eea43a.tar.gz chromium_src-de4a75910d32558f43bc0b0304e58a45d3eea43a.tar.bz2 |
Fix touch selection for Athena home card
This needs:
- Changing AthenaWindowTreeClient to return parent of a transient
parent as its transient child's default parent;
- Relaxing the assumption that home card container can only contain the
home card. It can also contain touch selection handles and quick
menu;
- Moving touch selection handles when a textfield view is moved around.
Currently, handles are moved only when the window is moved.
BUG=401109
Review URL: https://codereview.chromium.org/533403002
Cr-Commit-Position: refs/heads/master@{#293424}
Diffstat (limited to 'athena/home')
-rw-r--r-- | athena/home/home_card_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc index 727a1ad..8c0336f 100644 --- a/athena/home/home_card_impl.cc +++ b/athena/home/home_card_impl.cc @@ -120,11 +120,11 @@ class HomeCardLayoutManager : public aura::LayoutManager { home_card_ = NULL; } virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE { - Layout(false); } virtual void OnChildWindowVisibilityChanged(aura::Window* child, bool visible) OVERRIDE { - Layout(false); + if (home_card_ == child) + Layout(false); } virtual void SetChildBounds(aura::Window* child, const gfx::Rect& requested_bounds) OVERRIDE { |