chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 1748903003: Resets hover state when ToolbarActionView is dragged

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

Issue 1748903003: Resets hover state when ToolbarActionView is dragged (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resets hover state when ToolbarActionView is dragged (added a test) Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_action_view.h ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc » ('j') | ui/views/widget/widget.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

index 37f514008e26851b92a522a89aa171d9ee59ba42..6703918933d9cb56dcd05a14248bb17fad453055 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

@@ -199,6 +199,12 @@ gfx::Size ToolbarActionView::GetPreferredSize() const {

ToolbarActionsBar::IconHeight());

}

+void ToolbarActionView::OnMouseCaptureLost() {

+ MenuButton::OnMouseCaptureLost();

+ if (IsHotTracked())

+ SetState(STATE_NORMAL);

bool ToolbarActionView::OnMousePressed(const ui::MouseEvent& event) {

// views::MenuButton actions are only triggered by left mouse clicks.

if (event.IsOnlyLeftMouseButton()) {