Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit a0b1bdb
Author: Umberto Sonnino <rimher@gmail.com>
Date:   Mon Aug 26 18:07:33 2019 +0200

    Clip artboard rect

commit 894a97c
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Fri Aug 23 09:53:43 2019 -0700

    Updating changelog and pubspec.

commit ef7d75c
Author: Umberto Sonnino <rimher@gmail.com>
Date:   Thu Aug 22 19:04:04 2019 +0200

    Few updates to conform with Dart style

commit 4a0ce44
Author: Umberto Sonnino <rimher@gmail.com>
Date:   Thu Aug 22 19:01:01 2019 +0200

    Clamp paint opacity to ensure correct paint value

commit 1543c33
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Sun Aug 4 13:38:04 2019 -0700

    Adding a check for NaN numeric keyframe values. Mitigates #134. Still need to find out what Flare is exporting.

commit 562ac0b
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Wed Jul 24 13:47:25 2019 -0700

    Updating versions.

commit 1e5394b
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Wed Jul 24 11:47:01 2019 -0700

    Adding artboard option.

commit 6f6000f
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Mon Jul 8 21:19:43 2019 -0700

    Squashed commit of the following:

    commit f24a688
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon Jul 8 21:18:32 2019 -0700

        Squashed commit of the following:

        commit 085a15c
        Author: Luigi Rosso <luigi.rosso@gmail.com>
        Date:   Mon Jul 8 21:17:28 2019 -0700

            Squashed commit of the following:

            commit 56cea07
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Mon Jul 8 21:15:07 2019 -0700

                Updating stable to latest flare_flutter from dev.

            commit 28846c5
            Merge: e1a55f9 52d5e6e
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Sat Jul 6 11:06:01 2019 -0700

                Merge pull request #121 from 2d-inc/master

                Merging intrinsic_size_experiment changes

            commit e1a55f9
            Merge: 5533e73 15682ac
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Sat Jul 6 10:28:42 2019 -0700

                Merge pull request #119 from 2d-inc/master

                Check for null children before iterating for initialization.

            commit 5533e73
            Merge: 01387cd a17469b
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Wed Jul 3 10:40:12 2019 -0700

                Merge pull request #116 from 2d-inc/master

                Remove console spam.

            commit 01387cd
            Merge: 0ee2efe 525613e
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Tue Jul 2 18:13:31 2019 -0700

                Merge pull request #115 from 2d-inc/master

                Instance shape node from actor.

            commit 0ee2efe
            Merge: 8f04aa6 0230aab
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Thu Jun 20 16:27:00 2019 -0700

                Merge pull request #108 from 2d-inc/master

                Fixing rectangle and clips.

            commit 8f04aa6
            Merge: 6606b73 865e090
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Thu Jun 13 16:07:43 2019 -0700

                Merge pull request #102 from 2d-inc/master

                Updating dev branch.

            commit 6606b73
            Merge: 396cd88 f147157
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Tue Jun 4 11:59:29 2019 -0700

                Merge branch 'master' into dev

            commit 396cd88
            Merge: 006d85b 9db2d97
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Mon May 20 10:56:46 2019 -0700

                Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

            commit 006d85b
            Merge: c51192d 850ea83
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Mon May 20 10:45:58 2019 -0700

                Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

            commit c51192d
            Merge: 4aebb0f 4e9961b
            Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
            Date:   Thu May 9 11:44:40 2019 -0700

                Merge pull request #89 from 2d-inc/master

                Update indices to 16 bit unsigned, compatibility with flutter master.

            commit 4aebb0f
            Merge: 113d791 63c1d05
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Fri Apr 26 13:42:11 2019 -0700

                Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

            commit 113d791
            Merge: 2ec15af 4416a67
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Fri Apr 26 12:33:04 2019 -0700

                Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

            commit 2ec15af
            Merge: d8defc4 2dbb7ab
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Wed Apr 24 12:07:45 2019 -0700

                Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

            commit d8defc4
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Wed Apr 24 10:15:51 2019 -0700

                Fixing relative path for flare_dart.

            commit 2e1fcaa
            Author: Luigi Rosso <luigi.rosso@gmail.com>
            Date:   Wed Apr 24 10:14:38 2019 -0700

                Updating flare_dart dependency to dev branch of Flare-Flutter.

    commit 28846c5
    Merge: e1a55f9 52d5e6e
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Sat Jul 6 11:06:01 2019 -0700

        Merge pull request #121 from 2d-inc/master

        Merging intrinsic_size_experiment changes

    commit e1a55f9
    Merge: 5533e73 15682ac
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Sat Jul 6 10:28:42 2019 -0700

        Merge pull request #119 from 2d-inc/master

        Check for null children before iterating for initialization.

    commit 5533e73
    Merge: 01387cd a17469b
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Wed Jul 3 10:40:12 2019 -0700

        Merge pull request #116 from 2d-inc/master

        Remove console spam.

    commit 01387cd
    Merge: 0ee2efe 525613e
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Tue Jul 2 18:13:31 2019 -0700

        Merge pull request #115 from 2d-inc/master

        Instance shape node from actor.

    commit 0ee2efe
    Merge: 8f04aa6 0230aab
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu Jun 20 16:27:00 2019 -0700

        Merge pull request #108 from 2d-inc/master

        Fixing rectangle and clips.

    commit 8f04aa6
    Merge: 6606b73 865e090
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu Jun 13 16:07:43 2019 -0700

        Merge pull request #102 from 2d-inc/master

        Updating dev branch.

    commit 6606b73
    Merge: 396cd88 f147157
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Tue Jun 4 11:59:29 2019 -0700

        Merge branch 'master' into dev

    commit 396cd88
    Merge: 006d85b 9db2d97
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon May 20 10:56:46 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 006d85b
    Merge: c51192d 850ea83
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon May 20 10:45:58 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit c51192d
    Merge: 4aebb0f 4e9961b
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu May 9 11:44:40 2019 -0700

        Merge pull request #89 from 2d-inc/master

        Update indices to 16 bit unsigned, compatibility with flutter master.

    commit 4aebb0f
    Merge: 113d791 63c1d05
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Fri Apr 26 13:42:11 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 113d791
    Merge: 2ec15af 4416a67
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Fri Apr 26 12:33:04 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 2ec15af
    Merge: d8defc4 2dbb7ab
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 12:07:45 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit d8defc4
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 10:15:51 2019 -0700

        Fixing relative path for flare_dart.

    commit 2e1fcaa
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 10:14:38 2019 -0700

        Updating flare_dart dependency to dev branch of Flare-Flutter.

commit 085a15c
Author: Luigi Rosso <luigi.rosso@gmail.com>
Date:   Mon Jul 8 21:17:28 2019 -0700

    Squashed commit of the following:

    commit 56cea07
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon Jul 8 21:15:07 2019 -0700

        Updating stable to latest flare_flutter from dev.

    commit 28846c5
    Merge: e1a55f9 52d5e6e
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Sat Jul 6 11:06:01 2019 -0700

        Merge pull request #121 from 2d-inc/master

        Merging intrinsic_size_experiment changes

    commit e1a55f9
    Merge: 5533e73 15682ac
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Sat Jul 6 10:28:42 2019 -0700

        Merge pull request #119 from 2d-inc/master

        Check for null children before iterating for initialization.

    commit 5533e73
    Merge: 01387cd a17469b
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Wed Jul 3 10:40:12 2019 -0700

        Merge pull request #116 from 2d-inc/master

        Remove console spam.

    commit 01387cd
    Merge: 0ee2efe 525613e
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Tue Jul 2 18:13:31 2019 -0700

        Merge pull request #115 from 2d-inc/master

        Instance shape node from actor.

    commit 0ee2efe
    Merge: 8f04aa6 0230aab
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu Jun 20 16:27:00 2019 -0700

        Merge pull request #108 from 2d-inc/master

        Fixing rectangle and clips.

    commit 8f04aa6
    Merge: 6606b73 865e090
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu Jun 13 16:07:43 2019 -0700

        Merge pull request #102 from 2d-inc/master

        Updating dev branch.

    commit 6606b73
    Merge: 396cd88 f147157
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Tue Jun 4 11:59:29 2019 -0700

        Merge branch 'master' into dev

    commit 396cd88
    Merge: 006d85b 9db2d97
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon May 20 10:56:46 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 006d85b
    Merge: c51192d 850ea83
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Mon May 20 10:45:58 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit c51192d
    Merge: 4aebb0f 4e9961b
    Author: Luigi Rosso <luigi-rosso@users.noreply.github.com>
    Date:   Thu May 9 11:44:40 2019 -0700

        Merge pull request #89 from 2d-inc/master

        Update indices to 16 bit unsigned, compatibility with flutter master.

    commit 4aebb0f
    Merge: 113d791 63c1d05
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Fri Apr 26 13:42:11 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 113d791
    Merge: 2ec15af 4416a67
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Fri Apr 26 12:33:04 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit 2ec15af
    Merge: d8defc4 2dbb7ab
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 12:07:45 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter into dev

    commit d8defc4
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 10:15:51 2019 -0700

        Fixing relative path for flare_dart.

    commit 2e1fcaa
    Author: Luigi Rosso <luigi.rosso@gmail.com>
    Date:   Wed Apr 24 10:14:38 2019 -0700

        Updating flare_dart dependency to dev branch of Flare-Flutter.
  • Loading branch information
@luigi-rosso
luigi-rosso committed Aug 26, 2019
1 parent 998dc6f commit 2fddc7d
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions flare_flutter/lib/flare.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,11 +723,19 @@ class FlutterActorArtboard extends ActorArtboard {
FlutterActorArtboard(FlutterActor actor) : super(actor);

void draw(ui.Canvas canvas) {
if(clipContents) {
canvas.save();
AABB aabb = artboardAABB();
canvas.clipRect(Rect.fromLTRB(aabb[0], aabb[1], aabb[2], aabb[3]));
}
for (final ActorDrawable drawable in drawableNodes) {
if (drawable is FlutterActorDrawable) {
(drawable as FlutterActorDrawable).draw(canvas);
}
}
if(clipContents) {
canvas.restore();
}
}

void dispose() {}
Expand Down

0 comments on commit 2fddc7d

Please sign in to comment.