Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit 54b6d32

Browse files
author
Yuncong Zhang
committed
Move pragma to lines.
1 parent 77f57ab commit 54b6d32

File tree

8 files changed

+21
-16
lines changed

8 files changed

+21
-16
lines changed

Runtime/debugger/diagnostics.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using Unity.UIWidgets.foundation;
66
using Unity.UIWidgets.ui;
77

8+
namespace Unity.UIWidgets.debugger {
89
#pragma warning disable 0659
910
#pragma warning disable 0661
10-
namespace Unity.UIWidgets.debugger {
1111
public class DiagnosticsNode : IEquatable<DiagnosticsNode> {
1212
readonly Dictionary<string, object> _json; // todo use json class such as simple json
1313
public readonly bool isProperty;

Runtime/flow/physical_shape_layer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Color = Unity.UIWidgets.ui.Color;
55
using Rect = Unity.UIWidgets.ui.Rect;
66

7-
#pragma warning disable 0414
87
namespace Unity.UIWidgets.flow {
98
public class PhysicalShapeLayer : ContainerLayer {
109
public PhysicalShapeLayer(
@@ -18,6 +17,7 @@ public PhysicalShapeLayer(
1817
Color _shadow_color;
1918
float _device_pixel_ratio;
2019
Path _path;
20+
#pragma warning disable 0414
2121
bool _isRect;
2222
Rect _frameRRect;
2323
Clip _clip_behavior;

Runtime/foundation/key.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33

4+
namespace Unity.UIWidgets.foundation {
5+
46
#pragma warning disable 0660
57
#pragma warning disable 0661
6-
namespace Unity.UIWidgets.foundation {
78
public abstract class Key {
89
protected Key() {
910
}

Runtime/material/slider_theme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Rect = Unity.UIWidgets.ui.Rect;
1111
using TextStyle = Unity.UIWidgets.painting.TextStyle;
1212

13-
#pragma warning disable 0162
1413
namespace Unity.UIWidgets.material {
1514
public class SliderTheme : InheritedWidget {
1615
public SliderTheme(
@@ -930,6 +929,7 @@ TextPainter labelPainter
930929
return true;
931930
}
932931

932+
#pragma warning disable 0162
933933
Offset leftCenter = _topLobeCenter - new Offset(leftWidthNeeded, 0.0f) + neckStretch;
934934
Offset rightCenter = _topLobeCenter + new Offset(rightWidthNeeded, 0.0f) + neckStretch;
935935
Rect valueRect = Rect.fromLTRB(

Runtime/painting/fractional_offset.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,24 @@ public float dy {
3131
get { return (this.y + 1.0f) / 2.0f; }
3232
}
3333

34-
public new readonly FractionalOffset topLeft = new FractionalOffset(0.0f, 0.0f);
34+
#pragma warning disable 0108
35+
public static readonly FractionalOffset topLeft = new FractionalOffset(0.0f, 0.0f);
3536

36-
public new readonly FractionalOffset topCenter = new FractionalOffset(0.5f, 0.0f);
37+
public static readonly FractionalOffset topCenter = new FractionalOffset(0.5f, 0.0f);
3738

38-
public new readonly FractionalOffset topRight = new FractionalOffset(1.0f, 0.0f);
39+
public static readonly FractionalOffset topRight = new FractionalOffset(1.0f, 0.0f);
3940

40-
public new readonly FractionalOffset centerLeft = new FractionalOffset(0.0f, 0.5f);
41+
public static readonly FractionalOffset centerLeft = new FractionalOffset(0.0f, 0.5f);
4142

42-
public new readonly FractionalOffset center = new FractionalOffset(0.5f, 0.5f);
43+
public static readonly FractionalOffset center = new FractionalOffset(0.5f, 0.5f);
4344

44-
public new readonly FractionalOffset centerRight = new FractionalOffset(1.0f, 0.5f);
45+
public static readonly FractionalOffset centerRight = new FractionalOffset(1.0f, 0.5f);
4546

46-
public new readonly FractionalOffset bottomLeft = new FractionalOffset(0.0f, 1.0f);
47+
public static readonly FractionalOffset bottomLeft = new FractionalOffset(0.0f, 1.0f);
4748

48-
public new readonly FractionalOffset bottomCenter = new FractionalOffset(0.5f, 1.0f);
49+
public static readonly FractionalOffset bottomCenter = new FractionalOffset(0.5f, 1.0f);
4950

50-
public new readonly FractionalOffset bottomRight = new FractionalOffset(1.0f, 1.0f);
51+
public static readonly FractionalOffset bottomRight = new FractionalOffset(1.0f, 1.0f);
5152

5253
public static Alignment operator -(FractionalOffset a, Alignment b) {
5354
if (!(b is FractionalOffset)) {

Runtime/rendering/paragraph.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Color = Unity.UIWidgets.ui.Color;
1111
using Rect = Unity.UIWidgets.ui.Rect;
1212

13-
#pragma warning disable 0414
1413
namespace Unity.UIWidgets.rendering {
1514
public enum TextOverflow {
1615
/// Clip the overflowing text to fix its container.
@@ -251,6 +250,8 @@ public bool hasFocus {
251250
}
252251

253252
TextSpan _previousHoverSpan;
253+
254+
#pragma warning disable 0414
254255
bool _pointerHoverInside;
255256
bool _hasHoverRecognizer;
256257
MouseTrackerAnnotation _hoverAnnotation;

Tests/Editor/SceneViewTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
using UnityEngine;
1010
using Color = Unity.UIWidgets.ui.Color;
1111

12-
#pragma warning disable 0618
1312
namespace UIWidgets.Tests {
1413
public class SceneViewTests {
1514
public static void show() {
1615
onPreSceneGUIDelegate += OnPreSceneGUI;
16+
#pragma warning disable 0618
1717
SceneView.onSceneGUIDelegate += OnSceneGUI;
1818
EditorApplication.update += Update;
1919

@@ -30,11 +30,13 @@ public static void show() {
3030

3131
public static void hide() {
3232
onPreSceneGUIDelegate -= OnPreSceneGUI;
33+
#pragma warning disable 0618
3334
SceneView.onSceneGUIDelegate -= OnSceneGUI;
3435
EditorApplication.update -= Update;
3536
SceneView.RepaintAll();
3637
}
3738

39+
#pragma warning disable 0618
3840
public static SceneView.OnSceneFunc onPreSceneGUIDelegate {
3941
get {
4042
var field = typeof(SceneView).GetField("onPreSceneGUIDelegate",

Tests/Editor/Widgets.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
using TextStyle = Unity.UIWidgets.painting.TextStyle;
1919
using Transform = Unity.UIWidgets.widgets.Transform;
2020

21-
#pragma warning disable 0414
2221
namespace UIWidgets.Tests {
2322
public class Widgets : EditorWindow {
2423
WindowAdapter windowAdapter;
@@ -745,6 +744,7 @@ class _EventsWaterfallScreenState : State<EventsWaterfallScreen> {
745744
const float headerHeight = 80.0f;
746745

747746
float _offsetY = 0.0f;
747+
#pragma warning disable 0414
748748
int _index = -1;
749749

750750
Widget _buildHeader(BuildContext context) {

0 commit comments

Comments
 (0)