Fix closeManually, add tooltip and cursor when overlay is rendered, B…

…ump version to 4.2.0
darioielardi · Jul 28, 2021 · 1bc7c2c · 1bc7c2c
1 parent 385f171
commit 1bc7c2c
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [4.2.0] - 28 July 2021
+
+- Fix closeManually
+- Add click cursor on desktop and web when speed dial is opened
+- Add tooltip to speed dial when overlay is on
+- Fix overlay stale context brightness #184
+
 ## [4.1.0] - 10 July 2021
 
 - Add isOpenOnStart property

diff --git a/lib/src/background_overlay.dart b/lib/src/background_overlay.dart
@@ -10,6 +10,8 @@ class BackgroundOverlay extends AnimatedWidget {
   final LayerLink layerLink;
   final ShapeBorder shape;
   final VoidCallback? onTap;
+  final bool closeManually;
+  final String? tooltip;
 
   BackgroundOverlay({
     Key? key,
@@ -18,6 +20,8 @@ class BackgroundOverlay extends AnimatedWidget {
     required Animation<double> animation,
     required this.dialKey,
     required this.layerLink,
+    required this.closeManually,
+    required this.tooltip,
     this.color = Colors.white,
     this.opacity = 0.7,
   }) : super(key: key, listenable: animation);
@@ -31,7 +35,7 @@ class BackgroundOverlay extends AnimatedWidget {
           fit: StackFit.expand,
           children: [
             GestureDetector(
-              onTap: onTap,
+              onTap: closeManually ? null : onTap,
               child: Container(
                 decoration: BoxDecoration(
                     color: color, backgroundBlendMode: BlendMode.dstOut),
@@ -42,15 +46,21 @@ class BackgroundOverlay extends AnimatedWidget {
               child: CompositedTransformFollower(
                 link: layerLink,
                 showWhenUnlinked: false,
-                child: IgnorePointer(
-                  ignoring: true,
-                  child: Container(
-                    width: dialKey.globalPaintBounds!.size.width,
-                    height: dialKey.globalPaintBounds!.size.height,
-                    decoration: ShapeDecoration(
-                      shape:
-                          (shape == CircleBorder()) ? StadiumBorder() : shape,
-                      color: Colors.white,
+                child: MouseRegion(
+                  cursor: SystemMouseCursors.click,
+                  child: Tooltip(
+                    message: tooltip ?? '',
+                    child: GestureDetector(
+                      onTap: onTap,
+                      child: Container(
+                        width: dialKey.globalPaintBounds!.size.width,
+                        height: dialKey.globalPaintBounds!.size.height,
+                        decoration: ShapeDecoration(
+                          shape:
+                              shape == CircleBorder() ? StadiumBorder() : shape,
+                          color: Colors.white,
+                        ),
+                      ),
                     ),
                   ),
                 ),

diff --git a/lib/src/speed_dial.dart b/lib/src/speed_dial.dart
@@ -390,20 +390,22 @@ class _SpeedDialState extends State<SpeedDial>
               ));
       if (widget.renderOverlay) {
         backgroundOverlay = OverlayEntry(
-            builder: (ctx) {
-                bool _dark = Theme.of(ctx).brightness == Brightness.dark;
-                return BackgroundOverlay(
-                  dialKey: dialKey,
-                  layerLink: _layerLink,
-                  shape: widget.shape,
-                  onTap: _toggleChildren,
-                  // (_open && !widget.closeManually) ? _toggleChildren : null,
-                  animation: _controller,
-                  color: widget.overlayColor ??
-                      (_dark ? Colors.grey[900] : Colors.white)!,
-                  opacity: widget.overlayOpacity,
-                );
-            }
+          builder: (ctx) {
+            bool _dark = Theme.of(ctx).brightness == Brightness.dark;
+            return BackgroundOverlay(
+              dialKey: dialKey,
+              layerLink: _layerLink,
+              closeManually: widget.closeManually,
+              tooltip: widget.tooltip,
+              shape: widget.shape,
+              onTap: _toggleChildren,
+              // (_open && !widget.closeManually) ? _toggleChildren : null,
+              animation: _controller,
+              color: widget.overlayColor ??
+                  (_dark ? Colors.grey[900] : Colors.white)!,
+              opacity: widget.overlayOpacity,
+            );
+          },
         );
       }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_speed_dial
 description: Flutter plugin to implement a beautiful and dynamic Material Design Speed Dial with labels, animated icons, multi-directional children and much more.
-version: 4.1.0
+version: 4.2.0
 homepage: https://github.com/darioielardi/flutter_speed_dial/
 
 dependencies:
@@ -12,6 +12,6 @@ dev_dependencies:
     sdk: flutter
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=2.12.0 <3.0.0"
 
 flutter: