| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 package org.chromium.chromoting; | 5 package org.chromium.chromoting; |
| 6 | 6 |
| 7 import android.graphics.PointF; | 7 import android.graphics.PointF; |
| 8 import android.view.SurfaceHolder; | 8 import android.view.SurfaceHolder; |
| 9 | 9 |
| 10 import org.chromium.chromoting.jni.Client; | 10 import org.chromium.chromoting.jni.Client; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 public void run(Void p) { | 32 public void run(Void p) { |
| 33 mInputHandler.processAnimation(); | 33 mInputHandler.processAnimation(); |
| 34 } | 34 } |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 getHolder().addCallback(this); | 37 getHolder().addCallback(this); |
| 38 } | 38 } |
| 39 | 39 |
| 40 @Override | 40 @Override |
| 41 public void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos)
{ | 41 public void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos)
{ |
| 42 float diameter = getFeedbackRadius(feedbackToShow) * 2.0f; | 42 float scaleFactor = mRenderData.transform.mapRadius(1); |
| 43 float diameter = getFeedbackRadius(feedbackToShow, scaleFactor) * 2.0f; |
| 43 if (diameter <= 0.0f) { | 44 if (diameter <= 0.0f) { |
| 44 return; | 45 return; |
| 45 } | 46 } |
| 46 float scaleFactor = mRenderData.transform.mapRadius(1); | 47 mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter); |
| 47 mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter / scaleFactor); | |
| 48 } | 48 } |
| 49 | 49 |
| 50 @Override | 50 @Override |
| 51 public void transformationChanged() { | 51 public void transformationChanged() { |
| 52 if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0 | 52 if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0 |
| 53 || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0
) { | 53 || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0
) { |
| 54 return; | 54 return; |
| 55 } | 55 } |
| 56 float[] matrix = new float[9]; | 56 float[] matrix = new float[9]; |
| 57 mRenderData.transform.getValues(matrix); | 57 mRenderData.transform.getValues(matrix); |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 // the listeners when the surface is about to be destroyed. | 116 // the listeners when the surface is about to be destroyed. |
| 117 if (mOnHostSizeChangedListenerKey != null) { | 117 if (mOnHostSizeChangedListenerKey != null) { |
| 118 mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey); | 118 mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey); |
| 119 } | 119 } |
| 120 if (mOnCanvasRenderedListenerKey != null) { | 120 if (mOnCanvasRenderedListenerKey != null) { |
| 121 mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey); | 121 mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey); |
| 122 } | 122 } |
| 123 mDisplay.surfaceDestroyed(); | 123 mDisplay.surfaceDestroyed(); |
| 124 } | 124 } |
| 125 } | 125 } |
| OLD | NEW |