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

Unified Diff: ui/views/rect_based_targeting_utils.cc

Issue 94003003: Make extensions icons easier to target with gestures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove newline Created 7 years 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 | « ui/views/rect_based_targeting_utils.h ('k') | ui/views/rect_based_targeting_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/rect_based_targeting_utils.cc
diff --git a/ui/views/rect_based_targeting_utils.cc b/ui/views/rect_based_targeting_utils.cc
index 2e267cc1cc3b79e1331745b5ffca2cc9d2cb0ff5..de4d3464f645d1f6b6a3182d06e4f871ce44a674 100644
--- a/ui/views/rect_based_targeting_utils.cc
+++ b/ui/views/rect_based_targeting_utils.cc
@@ -9,21 +9,6 @@
namespace views {
-namespace {
-
-// The positive distance from |pos| to the nearest endpoint of the interval
-// [start, end] is returned if |pos| lies within the interval, otherwise
-// 0 is returned.
-int DistanceToInterval(int pos, int start, int end) {
- if (pos < start)
- return start - pos;
- if (pos > end)
- return pos - end;
- return 0;
-}
-
-} // namespace
-
bool UsePointBasedTargeting(const gfx::Rect& rect) {
return rect.width() == 1 && rect.height() == 1;
}
@@ -37,21 +22,11 @@ float PercentCoveredBy(const gfx::Rect& rect_1, const gfx::Rect& rect_2) {
static_cast<float>(intersect_area) / static_cast<float>(rect_1_area) : 0;
}
-int DistanceSquaredFromCenterLineToPoint(const gfx::Point& point,
- const gfx::Rect& rect) {
+int DistanceSquaredFromCenterToPoint(const gfx::Point& point,
+ const gfx::Rect& rect) {
gfx::Point center_point = rect.CenterPoint();
int dx = center_point.x() - point.x();
int dy = center_point.y() - point.y();
-
- if (rect.width() > rect.height()) {
- dx = DistanceToInterval(point.x(),
- rect.x() + (rect.height() / 2),
- rect.right() - (rect.height() / 2));
- } else {
- dy = DistanceToInterval(point.y(),
- rect.y() + (rect.width() / 2),
- rect.bottom() - (rect.width() / 2));
- }
return (dx * dx) + (dy * dy);
}
« no previous file with comments | « ui/views/rect_based_targeting_utils.h ('k') | ui/views/rect_based_targeting_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698