比较提交

...
此合并请求有变更与目标分支冲突。
/com.unity.uiwidgets/Runtime/redux/widget_redux.cs
/com.unity.uiwidgets/Runtime/rendering/binding.cs
/com.unity.uiwidgets/Runtime/widgets/binding.cs
/com.unity.uiwidgets/Runtime/gestures/converter.cs
/com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
/com.unity.uiwidgets/Runtime/editor/editor_mouse_tracking.cs
/com.unity.uiwidgets/Runtime/editor/editor_window.cs
/com.unity.uiwidgets/Runtime/gestures/mouse_tracking.cs

8 次代码提交

共有 7 个文件被更改,包括 86 次插入11 次删除
  1. 21
      com.unity.uiwidgets/Runtime/redux/widget_redux.cs
  2. 12
      com.unity.uiwidgets/Runtime/editor/editor_window.cs
  3. 20
      com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs
  4. 4
      com.unity.uiwidgets/Runtime/gestures/converter.cs
  5. 4
      com.unity.uiwidgets/Runtime/rendering/binding.cs
  6. 6
      com.unity.uiwidgets/Runtime/widgets/binding.cs
  7. 30
      com.unity.uiwidgets/Runtime/material/input_decorator.cs

21
com.unity.uiwidgets/Runtime/redux/widget_redux.cs


using System;
using Unity.UIWidgets.editor;
using Unity.UIWidgets.foundation;
using Unity.UIWidgets.ui;
using Unity.UIWidgets.widgets;

public readonly bool pure;
public readonly UIWidgetsEditorWindow host;
UIWidgetsEditorWindow host = null,
ViewModelBuilder<ViewModel> builder = null,
StoreConverter<State, ViewModel> converter = null,
bool pure = false,

D.assert(converter != null);
this.host = host;
this.pure = pure;
this.builder = builder;
this.converter = converter;

builder: this.builder,
converter: this.converter,
pure: this.pure,
shouldRebuild: this.shouldRebuild
shouldRebuild: this.shouldRebuild,
host : this.host
);
}
}

public readonly bool pure;
public readonly UIWidgetsEditorWindow host;
public _StoreListener(
ViewModelBuilder<ViewModel> builder = null,
StoreConverter<State, ViewModel> converter = null,

UIWidgetsEditorWindow host = null,
Key key = null) : base(key) {
D.assert(builder != null);
D.assert(converter != null);

this.converter = converter;
this.pure = pure;
this.shouldRebuild = shouldRebuild;
this.host = host;
}
public override widgets.State createState() {

}
void _handleStateChanged(State state) {
if (Window.hasInstance) {
if (this.widget.host != null) {
var preInstance = Window.instance;
using (WindowProvider.of(this.widget.host).getScope()) {
this._innerStateChanged(state);
}
Window.instance = preInstance;
}
else if (Window.hasInstance) {
this._innerStateChanged(state);
}
else {

12
com.unity.uiwidgets/Runtime/editor/editor_window.cs


public Window window {
get { return this._windowAdapter; }
}
public void forceUpdate() {
Widget root;
using (this._windowAdapter.getScope()) {
root = this.createWidget();
}
this._windowAdapter.attachRootWidget(root);
}
}
public class EditorWindowAdapter : WindowAdapter {

physicalY: evt.mousePosition.y * this._devicePixelRatio
);
}
else if (evt.type == EventType.MouseUp || evt.rawType == EventType.MouseUp) {
else if (evt.type == EventType.MouseUp || evt.rawType == EventType.MouseUp ||
evt.type == EventType.DragExited) {
pointerData = new PointerData(
timeStamp: Timer.timespanSinceStartup,
change: PointerChange.up,

20
com.unity.uiwidgets/Runtime/editor/widgets/unity_object_detector.cs


public delegate void DragFromEditorExitCallback();
public delegate void DragFromEditorStartCallback();
public delegate void DragFromEditorCancelCallback();
public delegate void DragFromEditorReleaseCallback(DragFromEditorDetails details);
public class DragFromEditorDetails {

DragFromEditorHoverCallback onHover = null,
DragFromEditorExitCallback onExit = null,
DragFromEditorReleaseCallback onRelease = null,
DragFromEditorStartCallback onStart = null,
DragFromEditorCancelCallback onCancel = null,
HitTestBehavior? behavior = null
) : base(key: key) {
this.child = child;

this.onDragFromEditorRelease = onRelease;
this.onDragFromEditorStart = onStart;
this.onDragFromEditorCancel = onCancel;
this.behavior = behavior;
}

public readonly DragFromEditorHoverCallback onDragFromEditorHover;
public readonly DragFromEditorExitCallback onDragFromEditorExit;
public readonly DragFromEditorReleaseCallback onDragFromEditorRelease;
public readonly DragFromEditorStartCallback onDragFromEditorStart;
public readonly DragFromEditorCancelCallback onDragFromEditorCancel;
public readonly HitTestBehavior? behavior;

public override Widget build(BuildContext context) {
Widget result = new Listener(
child: this.widget.child,
onPointerDown: (evt) => {
this.widget.onDragFromEditorStart?.Invoke();
},
onPointerUp: (evt) => {
this.widget.onDragFromEditorCancel?.Invoke();
},
onPointerCancel: (evt) => {
this.widget.onDragFromEditorCancel?.Invoke();
},
onPointerDragFromEditorEnter: this.widget.onDragFromEditorEnter == null
? ((PointerDragFromEditorEnterEventListener) null)
: (evt) => { this.widget.onDragFromEditorEnter.Invoke(); },

4
com.unity.uiwidgets/Runtime/gestures/converter.cs


#if UNITY_EDITOR
case PointerChange.dragFromEditorMove: {
_PointerState state = _ensureStateForPointer(datum, position);
state.startNewPointer();
//state.startNewPointer();
yield return new PointerDragFromEditorHoverEvent(
timeStamp: timeStamp,
pointer: state.pointer,

break;
case PointerChange.dragFromEditorRelease: {
_PointerState state = _ensureStateForPointer(datum, position);
state.startNewPointer();
//state.startNewPointer();
yield return new PointerDragFromEditorReleaseEvent(
timeStamp: timeStamp,
pointer: state.pointer,

4
com.unity.uiwidgets/Runtime/rendering/binding.cs


}, this.inEditorWindow);
}
protected virtual void drawFrame() {
protected virtual void drawFrame(bool layoutOnly = false) {
if (layoutOnly) return;
this.pipelineOwner.flushCompositingBits();
this.pipelineOwner.flushPaint();
this.renderView.compositeFrame();

6
com.unity.uiwidgets/Runtime/widgets/binding.cs


protected bool debugBuildingDirtyElements = false;
protected override void drawFrame() {
protected override void drawFrame(bool layoutOnly = false) {
D.assert(!this.debugBuildingDirtyElements);
D.assert(() => {
this.debugBuildingDirtyElements = true;

this.buildOwner.buildScope(this.renderViewElement);
}
base.drawFrame();
base.drawFrame(layoutOnly);
this.buildOwner.finalizeTree();
}
finally {

}
//The former widget tree must be layout first before its destruction
this.drawFrame();
this.drawFrame(true);
this.attachRootWidget(null);
this.buildOwner.buildScope(this._renderViewElement);
this.buildOwner.finalizeTree();

30
com.unity.uiwidgets/Runtime/material/input_decorator.cs


widthFactor: 1.0f,
heightFactor: 1.0f,
child: new ConstrainedBox(
constraints: new BoxConstraints(minWidth: 48.0f, minHeight: 48.0f),
constraints: this.decoration?.prefixIconConstraints ?? new BoxConstraints(minWidth: 48.0f, minHeight: 48.0f),
child: IconTheme.merge(
data: new IconThemeData(
color: iconColor,

widthFactor: 1.0f,
heightFactor: 1.0f,
child: new ConstrainedBox(
constraints: new BoxConstraints(minWidth: 48.0f, minHeight: 48.0f),
constraints: this.decoration?.suffixIconConstraints ?? new BoxConstraints(minWidth: 48.0f, minHeight: 48.0f),
child: IconTheme.merge(
data: new IconThemeData(
color: iconColor,

bool? isDense = null,
EdgeInsets contentPadding = null,
Widget prefixIcon = null,
BoxConstraints prefixIconConstraints = null,
BoxConstraints suffixIconConstraints = null,
Widget suffix = null,
string suffixText = null,
TextStyle suffixStyle = null,

this.prefix = prefix;
this.prefixText = prefixText;
this.prefixIcon = prefixIcon;
this.prefixIconConstraints = prefixIconConstraints;
this.suffixIconConstraints = suffixIconConstraints;
this.suffixStyle = suffixStyle;
this.counter = counter;
this.counterText = counterText;

isDense: false,
contentPadding: EdgeInsets.zero,
prefixIcon: null,
prefixIconConstraints: null,
suffixIconConstraints: null,
suffixText: null,
suffixStyle: null,
counter: null,

public bool isCollapsed;
public readonly Widget prefixIcon;
public readonly BoxConstraints prefixIconConstraints;
public readonly Widget prefix;

public readonly Widget suffixIcon;
public readonly BoxConstraints suffixIconConstraints;
public readonly Widget suffix;
public readonly string suffixText;

bool? isDense = null,
EdgeInsets contentPadding = null,
Widget prefixIcon = null,
BoxConstraints prefixIconConstraints = null,
BoxConstraints suffixIconConstraints = null,
Widget suffix = null,
string suffixText = null,
TextStyle suffixStyle = null,

isDense: isDense ?? this.isDense,
contentPadding: contentPadding ?? this.contentPadding,
prefixIcon: prefixIcon ?? this.prefixIcon,
prefixIconConstraints: prefixIconConstraints ?? this.prefixIconConstraints,
suffixIconConstraints: suffixIconConstraints ?? this.suffixIconConstraints,
suffix: suffix ?? this.suffix,
suffixText: suffixText ?? this.suffixText,
suffixStyle: suffixStyle ?? this.suffixStyle,

&& Equals(other.contentPadding, this.contentPadding)
&& Equals(other.isCollapsed, this.isCollapsed)
&& Equals(other.prefixIcon, this.prefixIcon)
&& Equals(other.prefixIconConstraints, this.prefixIconConstraints)
&& Equals(other.suffixIconConstraints, this.suffixIconConstraints)
&& Equals(other.suffix, this.suffix)
&& Equals(other.suffixText, this.suffixText)
&& Equals(other.suffixStyle, this.suffixStyle)

hashCode = (hashCode * 397) ^ this.border.GetHashCode();
hashCode = (hashCode * 397) ^ this.enabled.GetHashCode();
hashCode = (hashCode * 397) ^ this.prefixIcon.GetHashCode();
hashCode = (hashCode * 397) ^ this.prefixIconConstraints.GetHashCode();
hashCode = (hashCode * 397) ^ this.suffixIconConstraints.GetHashCode();
hashCode = (hashCode * 397) ^ this.suffix.GetHashCode();
hashCode = (hashCode * 397) ^ this.suffixText.GetHashCode();
hashCode = (hashCode * 397) ^ this.suffixStyle.GetHashCode();

description.Add($"prefixIcon: ${this.prefixIcon}");
}
if (this.prefixIconConstraints != null) {
description.Add($"prefixIconConstraints: ${this.prefixIconConstraints}");
}
if (this.prefix != null) {
description.Add($"prefix: ${this.prefix}");
}

if (this.suffixIcon != null) {
description.Add($"suffixIcon: ${this.suffixIcon}");
}
if (this.suffixIconConstraints != null) {
description.Add($"suffixIconConstraints: ${this.suffixIconConstraints}");
}
if (this.suffix != null) {

正在加载...
取消
保存