浏览代码

Merge branch 'keyboard' into 'master'

fix media query in startup

See merge request upm-packages/ui-widgets/com.unity.uiwidgets!116
/main
Shenhua Gu 6 年前
当前提交
178f4872
共有 4 个文件被更改,包括 15 次插入10 次删除
  1. 6
      Runtime/editor/editor_utils.cs
  2. 9
      Runtime/engine/DisplayMetrics.cs
  3. 5
      Runtime/engine/UIWidgetsPanel.cs
  4. 5
      Samples/UIWidgetSample/TextInputSample.cs

6
Runtime/editor/editor_utils.cs


this._lastDevicePixelRatio = GameViewUtil.getGameViewDevicePixelRatio();
}
public float DevicePixelRatio {
public void OnEnable() {
this._lastDevicePixelRatio = GameViewUtil.getGameViewDevicePixelRatio();
}
public float devicePixelRatio {
get { return this._lastDevicePixelRatio; }
}
}

9
Runtime/engine/DisplayMetrics.cs


}
public interface DisplayMetrics {
void OnEnable();
float DevicePixelRatio { get; }
float devicePixelRatio { get; }
}
public class PlayerDisplayMetrics: DisplayMetrics {

public void OnEnable() {
}
public void OnGUI() {
}

public float DevicePixelRatio {
public float devicePixelRatio {
get {
if (this._devicePixelRatio > 0) {
return this._devicePixelRatio;

5
Runtime/engine/UIWidgetsPanel.cs


Input.simulateMouseWithTouches = false;
this._displayMetrics = DisplayMetricsProvider.provider();
this._displayMetrics.OnEnable();
if (_repaintEvent == null) {
_repaintEvent = new Event {type = EventType.Repaint};
}

get {
return this.devicePixelRatioOverride > 0
? this.devicePixelRatioOverride
: this._displayMetrics.DevicePixelRatio;
: this._displayMetrics.devicePixelRatio;
}
}

5
Samples/UIWidgetSample/TextInputSample.cs


return new _EditableInputTypeWidgetState();
}
}
bool unityKeyboard = false;
//width:300,
// widget,
}
));
}

正在加载...
取消
保存