mirror of
https://github.com/flutter/flutter.git
synced 2026-02-11 13:22:46 +08:00
bf017b79b3
* Manually fix every use of Point.x and Point.y
Some of these were moved to dx/dy, but not all.
* Manually convert uses of the old gradient API
* Remove old reference to Point.
* Mechanical changes
I applied the following at the root of the Flutter repository:
git ls-files -z | xargs -0 sed -i 's/\bPoint[.]origin\b/Offset.zero/g'
git ls-files -z | xargs -0 sed -i 's/\bPoint[.]lerp\b/Offset.lerp/g'
git ls-files -z | xargs -0 sed -i 's/\bnew Point\b/new Offset/g'
git ls-files -z | xargs -0 sed -i 's/\bconst Point\b/const Offset/g'
git ls-files -z | xargs -0 sed -i 's/\bstatic Point /static Offset /g'
git ls-files -z | xargs -0 sed -i 's/\bfinal Point /final Offset /g'
git ls-files -z | xargs -0 sed -i 's/^\( *\)Point /\1Offset /g'
git ls-files -z | xargs -0 sed -i 's/ui[.]Point\b/ui.Offset/g'
git ls-files -z | xargs -0 sed -i 's/(Point\b/(Offset/g'
git ls-files -z | xargs -0 sed -i 's/\([[{,]\) Point\b/\1 Offset/g'
git ls-files -z | xargs -0 sed -i 's/@required Point\b/@required Offset/g'
git ls-files -z | xargs -0 sed -i 's/<Point>/<Offset>/g'
git ls-files -z | xargs -0 sed -i 's/[.]toOffset()//g'
git ls-files -z | xargs -0 sed -i 's/[.]toPoint()//g'
git ls-files -z | xargs -0 sed -i 's/\bshow Point, /show /g'
git ls-files -z | xargs -0 sed -i 's/\bshow Point;/show Offset;/g'
* Mechanical changes - dartdocs
I applied the following at the root of the Flutter repository:
git ls-files -z | xargs -0 sed -i 's/\ba \[Point\]/an [Offset]/g'
git ls-files -z | xargs -0 sed -i 's/\[Point\]/[Offset]/g'
* Further improvements and a test
* Fix minor errors from rebasing...
* Roll engine
71 lines
2.1 KiB
Dart
71 lines
2.1 KiB
Dart
// Copyright 2015 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:test/test.dart';
|
|
|
|
import 'rendering_tester.dart';
|
|
|
|
int layouts = 0;
|
|
|
|
class RenderLayoutWatcher extends RenderProxyBox {
|
|
RenderLayoutWatcher(RenderBox child) : super(child);
|
|
@override
|
|
void performLayout() {
|
|
layouts += 1;
|
|
super.performLayout();
|
|
}
|
|
}
|
|
|
|
void main() {
|
|
test('RenderViewport basic test - impact of layout', () {
|
|
RenderSliverToBoxAdapter sliver;
|
|
RenderViewport viewport;
|
|
RenderBox box;
|
|
final RenderObject root = new RenderLayoutWatcher(
|
|
viewport = new RenderViewport(
|
|
offset: new ViewportOffset.zero(),
|
|
children: <RenderSliver>[
|
|
sliver = new RenderSliverToBoxAdapter(child: box = new RenderSizedBox(const Size(100.0, 400.0))),
|
|
],
|
|
),
|
|
);
|
|
expect(layouts, 0);
|
|
layout(root);
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 200.0));
|
|
|
|
sliver.child = box = new RenderSizedBox(const Size(100.0, 300.0));
|
|
expect(layouts, 1);
|
|
pumpFrame();
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 150.0));
|
|
|
|
viewport.offset = new ViewportOffset.fixed(20.0);
|
|
expect(layouts, 1);
|
|
pumpFrame();
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 130.0));
|
|
|
|
viewport.offset = new ViewportOffset.fixed(-20.0);
|
|
expect(layouts, 1);
|
|
pumpFrame();
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 170.0));
|
|
|
|
viewport.anchor = 20.0 / 600.0;
|
|
expect(layouts, 1);
|
|
pumpFrame();
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 190.0));
|
|
|
|
viewport.axisDirection = AxisDirection.up;
|
|
expect(layouts, 1);
|
|
pumpFrame();
|
|
expect(layouts, 1);
|
|
expect(box.localToGlobal(box.size.center(Offset.zero)), const Offset(400.0, 600.0 - 190.0));
|
|
});
|
|
|
|
}
|