diff --git a/SECURITY.md b/SECURITY.md index 6e2dfb4dadcd..47b1d295f277 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,7 +4,7 @@ | Version | Supported | | | ------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | -| 2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-rc.1) | +| 2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-rc.2) | | 2.1.1 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | | 2.0.3 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3) | | 1.6.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1) | diff --git a/app/lib/view_painter.dart b/app/lib/view_painter.dart index aadb44b778bb..a8a0c5f047bd 100644 --- a/app/lib/view_painter.dart +++ b/app/lib/view_painter.dart @@ -96,7 +96,7 @@ class ViewPainter extends CustomPainter { final CameraViewport cameraViewport; final CameraTransform transform; final ColorScheme? colorScheme; - final Set invisibleCollections; + final Set invisibleLayers; final Map states; const ViewPainter( @@ -104,7 +104,7 @@ class ViewPainter extends CustomPainter { this.page, this.info, { this.currentArea, - this.invisibleCollections = const {}, + this.invisibleLayers = const {}, this.states = const {}, this.renderBackground = true, this.renderBaked = true, @@ -169,7 +169,7 @@ class ViewPainter extends CustomPainter { canvas.translate(-transform.position.dx, -transform.position.dy); for (final renderer in cameraViewport.unbakedElements) { final state = states[renderer.id]; - if (!invisibleCollections.contains(renderer.element.collection) && + if (!invisibleLayers.contains(renderer.layer) && state != RendererState.hidden) { final center = renderer.rect?.center; final radian = renderer.rotation * (pi / 180); diff --git a/app/lib/views/view.dart b/app/lib/views/view.dart index 25ad4c5c1e7d..9c129a623156 100644 --- a/app/lib/views/view.dart +++ b/app/lib/views/view.dart @@ -451,7 +451,7 @@ class _MainViewViewportState extends State state.info, cameraViewport: currentIndex.cameraViewport, transform: frictionTransform, - invisibleCollections: state.invisibleLayers, + invisibleLayers: state.invisibleLayers, states: currentIndex.allRendererStates, currentArea: state.currentArea, colorScheme: Theme.of(context).colorScheme, diff --git a/app/pubspec.lock b/app/pubspec.lock index c89139df93ee..9cdede925967 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1118,10 +1118,10 @@ packages: dependency: "direct main" description: name: printing - sha256: de1889f30b34029fc46e5de6a9841498850b23d32942a9ee810ca36b0cb1b234 + sha256: b576764370c920b510cedf3eac7dc199d6d4af34336d608e97546392c0113362 url: "https://pub.dev" source: hosted - version: "5.13.2" + version: "5.13.3" process: dependency: transitive description: diff --git a/metadata/en-US/changelogs/115.txt b/metadata/en-US/changelogs/115.txt index 747fd4b071ff..b200bde09333 100644 --- a/metadata/en-US/changelogs/115.txt +++ b/metadata/en-US/changelogs/115.txt @@ -5,5 +5,6 @@ * Fix current layer not being changed * Fix lock collection mode not working * Fix elements being modifyable in different layers +* Fix invisible layers setting being ignored Read more here: https://linwood.dev/butterfly/2.2.0-rc.2 \ No newline at end of file