Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: ui/views/view.cc

Issue 12395010: Context menu on views must show on mouse dpwn for non-WIN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 98e3b44b210a9652d9abf9a81f277fa4edd7421d..65290b79c1beedfc129deb3bdb387083e9fa5d82 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -57,6 +57,12 @@ bool use_acceleration_when_possible = true;
bool use_acceleration_when_possible = false;
#endif
+#if defined(OS_WIN)
+const bool kContextMenuOnMousePress = false;
+#else
+const bool kContextMenuOnMousePress = true;
+#endif
+
// Saves the drawing state, and restores the state when going out of scope.
class ScopedCanvas {
public:
@@ -2038,6 +2044,7 @@ bool View::ProcessMousePressed(const ui::MouseEvent& event) {
GetDragOperations(event.location()) : 0;
ContextMenuController* context_menu_controller = event.IsRightMouseButton() ?
context_menu_controller_ : 0;
+ View::DragInfo* drag_info = GetDragInfo();
const bool enabled = enabled_;
const bool result = OnMousePressed(event);
@@ -2046,8 +2053,20 @@ bool View::ProcessMousePressed(const ui::MouseEvent& event) {
if (!enabled)
return result;
+ // Assume that if there is a context menu controller we won't be deleted
+ // from mouse pressed.
+ if (event.IsOnlyRightMouseButton() && context_menu_controller &&
+ kContextMenuOnMousePress) {
+ gfx::Point location(event.location());
+ if (HitTestPoint(location)) {
+ ConvertPointToScreen(this, &location);
+ ShowContextMenu(location, true);
+ return true;
+ }
+ }
+
if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
- GetDragInfo()->PossibleDrag(event.location());
+ drag_info->PossibleDrag(event.location());
return true;
}
return !!context_menu_controller || result;
@@ -2076,7 +2095,8 @@ bool View::ProcessMouseDragged(const ui::MouseEvent& event) {
}
void View::ProcessMouseReleased(const ui::MouseEvent& event) {
- if (context_menu_controller_ && event.IsOnlyRightMouseButton()) {
+ if (!kContextMenuOnMousePress && context_menu_controller_ &&
+ event.IsOnlyRightMouseButton()) {
// Assume that if there is a context menu controller we won't be deleted
// from mouse released.
gfx::Point location(event.location());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698