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

Side by Side Diff: ui/views/controls/tree/tree_view.cc

Issue 139983009: ui::LocatedEvent location() returns gfx::PointF (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo accidental change. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/tree/tree_view.h" 5 #include "ui/views/controls/tree/tree_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 635
636 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) { 636 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) {
637 CommitEdit(); 637 CommitEdit();
638 RequestFocus(); 638 RequestFocus();
639 639
640 int row = (event.y() - kVerticalInset) / row_height_; 640 int row = (event.y() - kVerticalInset) / row_height_;
641 int depth = 0; 641 int depth = 0;
642 InternalNode* node = GetNodeByRow(row, &depth); 642 InternalNode* node = GetNodeByRow(row, &depth);
643 if (node) { 643 if (node) {
644 gfx::Rect bounds(GetBoundsForNodeImpl(node, row, depth)); 644 gfx::Rect bounds(GetBoundsForNodeImpl(node, row, depth));
645 if (bounds.Contains(event.location())) { 645 if (bounds.Contains(gfx::ToFlooredPoint(event.location()))) {
646 int relative_x = event.x() - bounds.x(); 646 int relative_x = event.x() - bounds.x();
647 if (base::i18n::IsRTL()) 647 if (base::i18n::IsRTL())
648 relative_x = bounds.width() - relative_x; 648 relative_x = bounds.width() - relative_x;
649 if (relative_x < kArrowRegionSize && 649 if (relative_x < kArrowRegionSize &&
650 model_->GetChildCount(node->model_node())) { 650 model_->GetChildCount(node->model_node())) {
651 if (node->is_expanded()) 651 if (node->is_expanded())
652 Collapse(node->model_node()); 652 Collapse(node->model_node());
653 else 653 else
654 Expand(node->model_node()); 654 Expand(node->model_node());
655 } else if (relative_x > kArrowRegionSize) { 655 } else if (relative_x > kArrowRegionSize) {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 if (!is_expanded_) 1035 if (!is_expanded_)
1036 return max_width; 1036 return max_width;
1037 for (int i = 0; i < child_count(); ++i) { 1037 for (int i = 0; i < child_count(); ++i) {
1038 max_width = std::max(max_width, 1038 max_width = std::max(max_width,
1039 GetChild(i)->GetMaxWidth(indent, depth + 1)); 1039 GetChild(i)->GetMaxWidth(indent, depth + 1));
1040 } 1040 }
1041 return max_width; 1041 return max_width;
1042 } 1042 }
1043 1043
1044 } // namespace views 1044 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698