address code review & make empty fields uncopyable

canonical · Jan 30, 2025 · e4e0678 · e4e0678
1 parent 8ff9e3e
commit e4e0678
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/src/client/gui/lib/copyable_text.dart b/src/client/gui/lib/copyable_text.dart
@@ -14,8 +14,10 @@ class CopyableText extends StatefulWidget {
 
 class _CopyableTextState extends State<CopyableText> {
   bool _copied = false;
+  bool get _isCopyable => widget.text != '-';
 
   void _copyToClipboard() async {
+    if (!_isCopyable) return;
     await Clipboard.setData(ClipboardData(text: widget.text));
     setState(() => _copied = true);
   }
@@ -28,19 +30,23 @@ class _CopyableTextState extends State<CopyableText> {
 
   @override
   Widget build(BuildContext context) {
+    Widget text = Text(
+      widget.text,
+      style: widget.style,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+
+    if (!_isCopyable) return text;
+
     return MouseRegion(
       cursor: SystemMouseCursors.click,
       onExit: (_) => _resetCopied(),
       child: GestureDetector(
         onTap: _copyToClipboard,
         child: Tooltip(
           message: _copied ? 'Copied' : 'Click to copy',
-          child: Text(
-            widget.text,
-            style: widget.style,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-          ),
+          child: text,
         ),
       ),
     );

diff --git a/src/client/gui/lib/tooltip.dart b/src/client/gui/lib/tooltip.dart
@@ -37,26 +37,16 @@ class _TooltipState extends fl.State<Tooltip> {
   fl.Widget build(fl.BuildContext context) {
     return fl.TooltipVisibility(
       visible: widget.visible,
-      child: _forceShow
-          ? fl.Tooltip(
-              key: _key,
-              message: widget.message,
-              textAlign: fl.TextAlign.center,
-              decoration: fl.BoxDecoration(
-                color: const fl.Color(0xff111111),
-                borderRadius: fl.BorderRadius.circular(2),
-              ),
-              child: widget.child,
-            )
-          : fl.Tooltip(
-              message: widget.message,
-              textAlign: fl.TextAlign.center,
-              decoration: fl.BoxDecoration(
-                color: const fl.Color(0xff111111),
-                borderRadius: fl.BorderRadius.circular(2),
-              ),
-              child: widget.child,
-            ),
+      child: fl.Tooltip(
+        key: _forceShow ? _key : null,
+        message: widget.message,
+        textAlign: fl.TextAlign.center,
+        decoration: fl.BoxDecoration(
+          color: const fl.Color(0xff111111),
+          borderRadius: fl.BorderRadius.circular(2),
+        ),
+        child: widget.child,
+      ),
     );
   }
 }
diff --git a/src/client/gui/lib/vm_details/ip_addresses.dart b/src/client/gui/lib/vm_details/ip_addresses.dart
@@ -21,7 +21,8 @@ class IpAddresses extends StatelessWidget {
             ? CopyableText(firstIp)
             : Tooltip(
                 message: firstIp,
-                child: Text(firstIp.nonBreaking, overflow: TextOverflow.ellipsis),
+                child:
+                    Text(firstIp.nonBreaking, overflow: TextOverflow.ellipsis),
               ),
       ),
       if (restIps.isNotEmpty)