浏览代码

Merge pull request #17 from Unity-Technologies/siyaoH/skiaWidget

fix widget compile error
/siyaoH-1.17-PlatformMessage
GitHub 4 年前
当前提交
2091c8fc
共有 19 个文件被更改,包括 54 次插入63 次删除
  1. 6
      com.unity.uiwidgets/Runtime/rendering/texture.cs
  2. 2
      com.unity.uiwidgets/Runtime/widgets/animated_size.cs
  3. 16
      com.unity.uiwidgets/Runtime/widgets/automatic_keep_alive.cs
  4. 8
      com.unity.uiwidgets/Runtime/widgets/basic.cs
  5. 9
      com.unity.uiwidgets/Runtime/widgets/dismissible.cs
  6. 2
      com.unity.uiwidgets/Runtime/widgets/editable_text.cs
  7. 2
      com.unity.uiwidgets/Runtime/widgets/list_wheel_scroll_view.cs
  8. 4
      com.unity.uiwidgets/Runtime/widgets/navigator.cs
  9. 2
      com.unity.uiwidgets/Runtime/widgets/nested_scroll_view.cs
  10. 2
      com.unity.uiwidgets/Runtime/widgets/overlay.cs
  11. 4
      com.unity.uiwidgets/Runtime/widgets/overscroll_indicator.cs
  12. 2
      com.unity.uiwidgets/Runtime/widgets/scroll_activity.cs
  13. 2
      com.unity.uiwidgets/Runtime/widgets/scroll_context.cs
  14. 2
      com.unity.uiwidgets/Runtime/widgets/scroll_position.cs
  15. 2
      com.unity.uiwidgets/Runtime/widgets/scrollable.cs
  16. 2
      com.unity.uiwidgets/Runtime/widgets/text_selection.cs
  17. 16
      com.unity.uiwidgets/Runtime/widgets/texture.cs
  18. 27
      com.unity.uiwidgets/Runtime/widgets/ticker_provider.cs
  19. 7
      com.unity.uiwidgets/Runtime/widgets/widget_inspector.cs

6
com.unity.uiwidgets/Runtime/rendering/texture.cs


_textureId = textureId;
}
public int textureId {
public int? textureId {
get { return _textureId; }
set {
D.assert(value != null);

}
}
int _textureId;
int? _textureId;
protected override bool sizedByParent {
get { return true; }

context.addLayer(new TextureLayer(
rect: Rect.fromLTWH(offset.dx, offset.dy, size.width, size.height),
textureId: _textureId
textureId: _textureId.Value
));
}
}

2
com.unity.uiwidgets/Runtime/widgets/animated_size.cs


using Unity.UIWidgets.foundation;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
namespace Unity.UIWidgets.widgets {
public class AnimatedSize : SingleChildRenderObjectWidget {

16
com.unity.uiwidgets/Runtime/widgets/automatic_keep_alive.cs


using System.Collections.Generic;
using Unity.UIWidgets.async2;
using Unity.UIWidgets.foundation;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
namespace Unity.UIWidgets.widgets {

if (!mounted) {
return;
}
ParentDataElement childElement1 = _getChildElement();
D.assert(childElement1 != null);
_updateParentDataOfChild(childElement1);

if (mounted && _handles.isEmpty()) {
setState(() => { D.assert(!_keepingAlive); });
}
return null;
});
}

return null;
}
}
public abstract class AutomaticKeepAliveClientWithTickerProviderStateMixin<T> : State<T>, TickerProvider
where T : StatefulWidget {
HashSet<Ticker> _tickers;

Func<string> debugLabel = null;
D.assert(() => {
debugLabel = () => "created by " + this;
return true;
});
var result = new _AutomaticWidgetTicker<T>(onTick, this, debugLabel: debugLabel);
var result = new _AutomaticWidgetTicker<T>(onTick, this,
debugLabel: foundation_.kDebugMode ? "created by " + this : null);
_tickers.Add(result);
return result;
}

8
com.unity.uiwidgets/Runtime/widgets/basic.cs


ImageRepeat repeat = ImageRepeat.noRepeat,
Rect centerSlice = null,
bool invertColors = false,
FilterMode filterMode = FilterMode.Bilinear
FilterQuality filterQuality = FilterQuality.low
) : base(key) {
this.image = image;
this.width = width;

this.centerSlice = centerSlice;
this.invertColors = invertColors;
this.filterMode = filterMode;
this.filterQuality = filterQuality;
}
public readonly ui.Image image;

public readonly ImageRepeat repeat;
public readonly Rect centerSlice;
public readonly bool invertColors;
public readonly FilterQuality filterQuality;
public override RenderObject createRenderObject(BuildContext context) {
return new RenderImage(

repeat: repeat,
centerSlice: centerSlice,
invertColors: invertColors,
filterMode: filterMode
filterQuality: filterQuality
);
}

renderImage.repeat = repeat;
renderImage.centerSlice = centerSlice;
renderImage.invertColors = invertColors;
renderImage.filterMode = filterMode;
renderImage.filterQuality = filterQuality;
}
public override void debugFillProperties(DiagnosticPropertiesBuilder properties) {

9
com.unity.uiwidgets/Runtime/widgets/dismissible.cs


using Unity.UIWidgets.gestures;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
namespace Unity.UIWidgets.widgets {

internal _AutomaticWidgetTicker(
TickerCallback onTick,
AutomaticKeepAliveClientWithTickerProviderStateMixin<T> creator,
Func<string> debugLabel = null) :
string debugLabel = null) :
base(onTick: onTick, debugLabel: debugLabel) {
_creator = creator;
}

public override void dispose() {
public override void Dispose() {
base.dispose();
base.Dispose();
}
}

2
com.unity.uiwidgets/Runtime/widgets/editable_text.cs


using Unity.UIWidgets.material;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.service;
using Unity.UIWidgets.ui;
using UnityEngine;

2
com.unity.uiwidgets/Runtime/widgets/list_wheel_scroll_view.cs


using Unity.UIWidgets.physics;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.external;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
using UnityEngine;

4
com.unity.uiwidgets/Runtime/widgets/navigator.cs


using Unity.UIWidgets.gestures;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler2;
using SchedulerBinding = Unity.UIWidgets.scheduler.SchedulerBinding;
using SchedulerPhase = Unity.UIWidgets.scheduler.SchedulerPhase;
using SchedulerBinding = Unity.UIWidgets.scheduler2.SchedulerBinding;
using SchedulerPhase = Unity.UIWidgets.scheduler2.SchedulerPhase;
namespace Unity.UIWidgets.widgets {
public delegate Route RouteFactory(RouteSettings settings);

2
com.unity.uiwidgets/Runtime/widgets/nested_scroll_view.cs


using Unity.UIWidgets.painting;
using Unity.UIWidgets.physics;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
using UnityEngine;
using Color = Unity.UIWidgets.ui.Color;

2
com.unity.uiwidgets/Runtime/widgets/overlay.cs


using Unity.UIWidgets.foundation;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
namespace Unity.UIWidgets.widgets {

4
com.unity.uiwidgets/Runtime/widgets/overscroll_indicator.cs


using Unity.UIWidgets.painting;
using Unity.UIWidgets.physics;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
using UnityEngine;
using Canvas = Unity.UIWidgets.ui.Canvas;

public override void dispose() {
_glowController.dispose();
_displacementTicker.dispose();
_displacementTicker.Dispose();
_pullRecedeTimer?.cancel();
base.dispose();
}

2
com.unity.uiwidgets/Runtime/widgets/scroll_activity.cs


using Unity.UIWidgets.gestures;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.physics;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
using UnityEngine;

2
com.unity.uiwidgets/Runtime/widgets/scroll_context.cs


using Unity.UIWidgets.painting;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
namespace Unity.UIWidgets.widgets {
public interface ScrollContext {

2
com.unity.uiwidgets/Runtime/widgets/scroll_position.cs


using Unity.UIWidgets.painting;
using Unity.UIWidgets.physics;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
namespace Unity.UIWidgets.widgets {

2
com.unity.uiwidgets/Runtime/widgets/scrollable.cs


using Unity.UIWidgets.gestures;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
using UnityEngine;

2
com.unity.uiwidgets/Runtime/widgets/text_selection.cs


using Unity.UIWidgets.foundation;
using Unity.UIWidgets.gestures;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.service;
using Unity.UIWidgets.ui;
using Rect = Unity.UIWidgets.ui.Rect;

16
com.unity.uiwidgets/Runtime/widgets/texture.cs


// instance.scheduleFrame(false);
// }
// }
public Texture(Key key = null, UnityEngine.Texture texture = null) : base(key: key) {
D.assert(texture != null);
this.texture = texture;
public Texture( Key key = null, int? textureId = null) : base(key: key) {
D.assert(textureId != null);
this.textureId = textureId.Value;
public readonly UnityEngine.Texture texture;
public readonly int textureId;
return new TextureBox(texture: texture);
return new TextureBox(textureId: textureId);
((TextureBox) renderObject).texture = texture;
((TextureBox) renderObject).textureId = textureId;
}
}

27
com.unity.uiwidgets/Runtime/widgets/ticker_provider.cs


using System;
using System.Collections.Generic;
using Unity.UIWidgets.foundation;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
namespace Unity.UIWidgets.widgets {
public class TickerMode : InheritedWidget {

"mixing in a SingleTickerProviderStateMixin, use a regular TickerProviderStateMixin."
);
});
Func<string> debugLabel = null;
D.assert(() => {
debugLabel = () => "created by " + this;
return true;
});
_ticker = new Ticker(onTick, debugLabel: debugLabel);
_ticker = new Ticker(onTick, debugLabel: foundation_.kDebugMode ? $"created by {this}" : null);
return _ticker;
}

public Ticker createTicker(TickerCallback onTick) {
_tickers = _tickers ?? new HashSet<Ticker>();
Func<string> debugLabel = null;
D.assert(() => {
debugLabel = () => "created by " + this;
return true;
});
var result = new _WidgetTicker<T>(onTick, this, debugLabel: debugLabel);
var result = new _WidgetTicker<T>(onTick, this,
debugLabel: foundation_.kDebugMode ? "created by " + this : null);
_tickers.Add(result);
return result;
}

internal _WidgetTicker(
TickerCallback onTick,
TickerProviderStateMixin<T> creator,
Func<string> debugLabel = null) :
string debugLabel = null) :
base(onTick: onTick, debugLabel: debugLabel) {
_creator = creator;
}

public override void dispose() {
public override void Dispose() {
base.dispose();
base.Dispose();
}
}
}

7
com.unity.uiwidgets/Runtime/widgets/widget_inspector.cs


using Unity.UIWidgets.gestures;
using Unity.UIWidgets.painting;
using Unity.UIWidgets.rendering;
using Unity.UIWidgets.scheduler;
using Unity.UIWidgets.scheduler2;
using Unity.UIWidgets.ui;
namespace Unity.UIWidgets.widgets {

return null;
}
internal override flow.Layer addToScene(SceneBuilder builder, Offset layerOffset = null) {
internal override void addToScene(SceneBuilder builder, Offset layerOffset = null) {
return null;
return;
}
RenderObject selected = selection.current;

}
builder.addPicture(layerOffset, _picture);
return null;
}

正在加载...
取消
保存