Commit ddb03e9b authored by Xiaoqian Dai's avatar Xiaoqian Dai Committed by Commit Bot

Tab dragging: Fix the new selector item stacking order regression.

The new selector item's window and its |item_widget_| should be placed
below the dragged window.

Bug: 871580
Change-Id: I48d5705c687b4b75518d5ec47c71b8f746f22587
Reviewed-on: https://chromium-review.googlesource.com/1164525Reviewed-by: default avatarMin Chen <minch@chromium.org>
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581048}
parent 5e61a5b7
......@@ -198,6 +198,10 @@ std::unique_ptr<views::Widget> CreateNewSelectorItemWidget(
widget->SetContentsView(new NewSelectorItemView());
widget->Show();
// Stack the newly created widget below the dragged window.
dragged_window->parent()->StackChildBelow(widget->GetNativeWindow(),
dragged_window);
if (animate) {
widget->SetOpacity(0.f);
ui::ScopedLayerAnimationSettings animation_settings(
......@@ -573,12 +577,6 @@ void WindowGrid::OnWindowDragStarted(aura::Window* dragged_window,
window_selector_->AddItem(new_selector_item_widget_->GetNativeWindow(),
/*reposition=*/true, animate);
// Stack the newly added window item below |dragged_window|.
DCHECK_EQ(dragged_window->parent(),
new_selector_item_widget_->GetNativeWindow()->parent());
dragged_window->parent()->StackChildBelow(
new_selector_item_widget_->GetNativeWindow(), dragged_window);
// Called to set caption and title visibility during dragging.
OnSelectorItemDragStarted(/*item=*/nullptr);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment