Commit 0d4c69e7 authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Material Refresh - When dragging tabs, don't track |hovered_tab|.

Bug: 853240
Change-Id: I8112807df34779c78e2d96ce15e391eb1863d8d1
Reviewed-on: https://chromium-review.googlesource.com/1112198Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569674}
parent f97129a3
......@@ -1176,8 +1176,10 @@ void TabStrip::PaintChildren(const views::PaintInfo& paint_info) {
} else if (!tab->IsActive()) {
if (!tab->IsSelected()) {
if (!stacked_layout_) {
// In Refresh mode, defer the painting of the hovered tab to below.
if (MD::IsRefreshUi() && tab->IsMouseHovered()) {
// In Refresh mode, defer the painting of the hovered tab to below
// unless a tab drag operation is in progress.
if (MD::IsRefreshUi() && tab->IsMouseHovered() &&
!(drag_controller_ && drag_controller_->started_drag())) {
// Since two adjacent tabs overlap, they can both return as being
// hovered. Favor the left-most tab by ensuring the current
// |hovered_tab| is painted before assigning from |tab|.
......
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