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

Side by Side Diff: content/browser/android/popup_touch_handle_drawable.cc

Issue 481683003: Support for Adaptive Handle Orientation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unittests Created 5 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/browser/android/popup_touch_handle_drawable.h" 5 #include "content/browser/android/popup_touch_handle_drawable.h"
6 6
7 #include "jni/PopupTouchHandleDrawable_jni.h" 7 #include "jni/PopupTouchHandleDrawable_jni.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 PopupTouchHandleDrawable::PopupTouchHandleDrawable( 11 PopupTouchHandleDrawable::PopupTouchHandleDrawable(
12 base::android::ScopedJavaLocalRef<jobject> drawable, 12 base::android::ScopedJavaLocalRef<jobject> drawable,
13 float dpi_scale) 13 float dpi_scale)
14 : dpi_scale_(dpi_scale), drawable_(drawable) { 14 : dpi_scale_(dpi_scale), drawable_(drawable) {
15 DCHECK(drawable.obj()); 15 DCHECK(drawable.obj());
16 drawable_padding_ = GetPaddingSize();
16 } 17 }
17 18
18 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() { 19 PopupTouchHandleDrawable::~PopupTouchHandleDrawable() {
19 // Explicitly disabling ensures that any external references to the Java 20 // Explicitly disabling ensures that any external references to the Java
20 // object are cleared, allowing it to be GC'ed in a timely fashion. 21 // object are cleared, allowing it to be GC'ed in a timely fashion.
21 SetEnabled(false); 22 SetEnabled(false);
22 } 23 }
23 24
24 void PopupTouchHandleDrawable::SetEnabled(bool enabled) { 25 void PopupTouchHandleDrawable::SetEnabled(bool enabled) {
25 JNIEnv* env = base::android::AttachCurrentThread(); 26 JNIEnv* env = base::android::AttachCurrentThread();
26 if (enabled) 27 if (enabled)
27 Java_PopupTouchHandleDrawable_show(env, drawable_.obj()); 28 Java_PopupTouchHandleDrawable_show(env, drawable_.obj());
28 else 29 else
29 Java_PopupTouchHandleDrawable_hide(env, drawable_.obj()); 30 Java_PopupTouchHandleDrawable_hide(env, drawable_.obj());
30 } 31 }
31 32
32 void PopupTouchHandleDrawable::SetOrientation( 33 void PopupTouchHandleDrawable::SetLayout(const gfx::PointF& position,
33 ui::TouchHandleOrientation orientation) { 34 ui::TouchHandleOrientation orientation,
35 bool mirror_vertical,
36 bool mirror_horizontal) {
37 const gfx::PointF position_pix = gfx::ScalePoint(position, dpi_scale_);
34 JNIEnv* env = base::android::AttachCurrentThread(); 38 JNIEnv* env = base::android::AttachCurrentThread();
35 jobject obj = drawable_.obj(); 39 jobject obj = drawable_.obj();
36 Java_PopupTouchHandleDrawable_setOrientation(env, obj, 40
37 static_cast<int>(orientation)); 41 Java_PopupTouchHandleDrawable_setFocus(env, obj, position_pix.x(),
42 position_pix.y());
43
44 Java_PopupTouchHandleDrawable_setOrientation(
45 env, obj, static_cast<int>(orientation), mirror_vertical,
46 mirror_horizontal);
38 } 47 }
39 48
40 void PopupTouchHandleDrawable::SetAlpha(float alpha) { 49 void PopupTouchHandleDrawable::SetAlpha(float alpha) {
41 JNIEnv* env = base::android::AttachCurrentThread(); 50 JNIEnv* env = base::android::AttachCurrentThread();
42 bool visible = alpha > 0; 51 bool visible = alpha > 0;
43 Java_PopupTouchHandleDrawable_setVisible(env, drawable_.obj(), visible); 52 Java_PopupTouchHandleDrawable_setVisible(env, drawable_.obj(), visible);
44 } 53 }
45 54
46 void PopupTouchHandleDrawable::SetFocus(const gfx::PointF& position) {
47 const gfx::PointF position_pix = gfx::ScalePoint(position, dpi_scale_);
48 JNIEnv* env = base::android::AttachCurrentThread();
49 Java_PopupTouchHandleDrawable_setFocus(
50 env, drawable_.obj(), position_pix.x(), position_pix.y());
51 }
52
53 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const { 55 gfx::RectF PopupTouchHandleDrawable::GetVisibleBounds() const {
54 JNIEnv* env = base::android::AttachCurrentThread(); 56 JNIEnv* env = base::android::AttachCurrentThread();
55 gfx::RectF unscaled_rect( 57 gfx::RectF unscaled_rect(
56 Java_PopupTouchHandleDrawable_getPositionX(env, drawable_.obj()), 58 Java_PopupTouchHandleDrawable_getPositionX(env, drawable_.obj()),
57 Java_PopupTouchHandleDrawable_getPositionY(env, drawable_.obj()), 59 Java_PopupTouchHandleDrawable_getPositionY(env, drawable_.obj()),
58 Java_PopupTouchHandleDrawable_getVisibleWidth(env, drawable_.obj()), 60 Java_PopupTouchHandleDrawable_getVisibleWidth(env, drawable_.obj()),
59 Java_PopupTouchHandleDrawable_getVisibleHeight(env, drawable_.obj())); 61 Java_PopupTouchHandleDrawable_getVisibleHeight(env, drawable_.obj()));
60 return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_); 62 return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
61 } 63 }
62 64
65 gfx::SizeF PopupTouchHandleDrawable::GetPaddingSize() {
66 gfx::SizeF drawable_padding;
67 JNIEnv* env = base::android::AttachCurrentThread();
68 float vertical_padding =
69 Java_PopupTouchHandleDrawable_getHandleVerticalPadding(env,
70 drawable_.obj());
71 float horizontal_padding =
72 Java_PopupTouchHandleDrawable_getHandleHorizontalPadding(env,
73 drawable_.obj());
74 drawable_padding.set_height(vertical_padding);
75 drawable_padding.set_width(horizontal_padding);
76 return drawable_padding;
77 }
78
79 gfx::SizeF PopupTouchHandleDrawable::GetDrawablePadding() const {
80 return drawable_padding_;
81 }
82
63 // static 83 // static
64 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) { 84 bool PopupTouchHandleDrawable::RegisterPopupTouchHandleDrawable(JNIEnv* env) {
65 return RegisterNativesImpl(env); 85 return RegisterNativesImpl(env);
66 } 86 }
67 87
68 } // namespace content 88 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698