Commit 21dd5f1e authored by Avery Musbach's avatar Avery Musbach Committed by Commit Bot

Disallow starting to drag from overview during its starting animation

Test: manual
Bug: 1012509
Change-Id: Ifd210885de279c26837f7b774ee0565b8d6d1237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848121Reviewed-by: default avatarSammie Quon <sammiequon@chromium.org>
Commit-Queue: Avery Musbach <amusbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703974}
parent 5d50d1e0
......@@ -392,8 +392,10 @@ void OverviewSession::RemoveItem(OverviewItem* overview_item) {
void OverviewSession::InitiateDrag(OverviewItem* item,
const gfx::PointF& location_in_screen,
bool is_touch_dragging) {
if (Shell::Get()->split_view_controller()->IsDividerAnimating())
if (Shell::Get()->overview_controller()->IsInStartAnimation() ||
Shell::Get()->split_view_controller()->IsDividerAnimating()) {
return;
}
highlight_controller_->SetFocusHighlightVisibility(false);
window_drag_controller_ = std::make_unique<OverviewWindowDragController>(
this, item, is_touch_dragging);
......
......@@ -137,6 +137,7 @@ OverviewWindowDragController::OverviewWindowDragController(
is_touch_dragging_(is_touch_dragging),
should_allow_split_view_(ShouldAllowSplitView()),
virtual_desks_bar_enabled_(GetVirtualDesksBarEnabled(item)) {
DCHECK(!Shell::Get()->overview_controller()->IsInStartAnimation());
DCHECK(!Shell::Get()->split_view_controller()->IsDividerAnimating());
}
......
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