Chromium Code Reviews| 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.Point; | 7 import android.graphics.Point; |
| 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 12 matching lines...) Expand all Loading... | |
| 23 public GlDesktopView(GlDisplay display, Desktop desktop, Client client) { | 23 public GlDesktopView(GlDisplay display, Desktop desktop, Client client) { |
| 24 super(desktop, client); | 24 super(desktop, client); |
| 25 Preconditions.notNull(display); | 25 Preconditions.notNull(display); |
| 26 mDisplay = display; | 26 mDisplay = display; |
| 27 | 27 |
| 28 getHolder().addCallback(this); | 28 getHolder().addCallback(this); |
| 29 } | 29 } |
| 30 | 30 |
| 31 @Override | 31 @Override |
| 32 public void showInputFeedback(InputFeedbackType feedbackToShow, Point pos) { | 32 public void showInputFeedback(InputFeedbackType feedbackToShow, Point pos) { |
| 33 float diameter; | 33 float diameter = getFeedbackRadius(feedbackToShow) * 2; |
| 34 // TODO(yuweih): diameter (and radius in DesktopView) should be defined in dp so that it is | 34 if (diameter <= 0.0f) { |
| 35 // DPI independent. | 35 return; |
| 36 switch (feedbackToShow) { | |
| 37 case LARGE_ANIMATION: | |
| 38 diameter = 320.f; | |
| 39 break; | |
| 40 case SMALL_ANIMATION: | |
| 41 diameter = 80.f; | |
| 42 break; | |
| 43 default: | |
| 44 return; | |
| 45 } | 36 } |
| 46 float scaleFactor = mRenderData.transform.mapRadius(1); | 37 float scaleFactor = mRenderData.transform.mapRadius(1); |
| 47 mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter / scaleFactor); | 38 mDisplay.showCursorInputFeedback(pos.x, pos.y, 2 * diameter / scaleFacto r); |
|
Lambros
2016/07/26 18:54:17
Not 2.0f ?
Personally, I prefer just 0 and 2 :)
Yuwei
2016/07/26 19:05:43
Oops... I think I just found a bug here for multip
| |
| 48 } | 39 } |
| 49 | 40 |
| 50 @Override | 41 @Override |
| 51 public void transformationChanged() { | 42 public void transformationChanged() { |
| 52 if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0 | 43 if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0 |
| 53 || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0 ) { | 44 || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0 ) { |
| 54 return; | 45 return; |
| 55 } | 46 } |
| 56 float[] matrix = new float[9]; | 47 float[] matrix = new float[9]; |
| 57 mRenderData.transform.getValues(matrix); | 48 mRenderData.transform.getValues(matrix); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 @Override | 109 @Override |
| 119 public void surfaceDestroyed(SurfaceHolder holder) { | 110 public void surfaceDestroyed(SurfaceHolder holder) { |
| 120 // GlDisplay's life time spans to the whole session while GlDesktopView may be created and | 111 // GlDisplay's life time spans to the whole session while GlDesktopView may be created and |
| 121 // destroyed for multiple times (say when the phone is rotated). It is i mportant to remove | 112 // destroyed for multiple times (say when the phone is rotated). It is i mportant to remove |
| 122 // the listeners when the surface is about to be destroyed. | 113 // the listeners when the surface is about to be destroyed. |
| 123 mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey); | 114 mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey); |
| 124 mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey); | 115 mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey); |
| 125 mDisplay.surfaceDestroyed(); | 116 mDisplay.surfaceDestroyed(); |
| 126 } | 117 } |
| 127 } | 118 } |
| OLD | NEW |