From 15ae6844ca02e4923c5773eb8f9abc92f441ff81 Mon Sep 17 00:00:00 2001
From: Kelrap <kel.raphael3@outlook.com>
Date: Fri, 27 Jun 2025 12:03:52 -0400
Subject: [PATCH 1/2] Simplify audio button error behavior, remove audio error
 reset on clear, remove tooltip on error

---
 lib/pangea/toolbar/widgets/select_mode_buttons.dart | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/pangea/toolbar/widgets/select_mode_buttons.dart b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
index f2f561361..fcc43c81a 100644
--- a/lib/pangea/toolbar/widgets/select_mode_buttons.dart
+++ b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
@@ -125,7 +125,8 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
 
   void _clear() {
     setState(() {
-      _audioError = null;
+      // Audio errors do not go away when I switch modes and back
+      // Is there any reason to wipe error records on clear?
       _translationError = null;
       _speechTranslationError = null;
     });
@@ -148,8 +149,10 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
     }
 
     setState(
-      () => _selectedMode =
-          _selectedMode == mode && mode != SelectMode.audio ? null : mode,
+      () => _selectedMode = _selectedMode == mode &&
+              (mode != SelectMode.audio || _audioError != null)
+          ? null
+          : mode,
     );
 
     if (_selectedMode == SelectMode.audio) {
@@ -486,7 +489,7 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
         children: [
           for (final mode in modes)
             Tooltip(
-              message: mode.tooltip(context),
+              message: _isError ? null : mode.tooltip(context),
               child: PressableButton(
                 depressed: mode == _selectedMode,
                 borderRadius: BorderRadius.circular(20),

From 678e32a80f2730467071300fee94ee0e2e844799 Mon Sep 17 00:00:00 2001
From: Kelrap <kel.raphael3@outlook.com>
Date: Fri, 27 Jun 2025 12:32:11 -0400
Subject: [PATCH 2/2] Use tooltipvisibility, don't mess with tooltips for
 non-selected modes

---
 .../toolbar/widgets/select_mode_buttons.dart  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/pangea/toolbar/widgets/select_mode_buttons.dart b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
index 0025ff800..1a5ff426b 100644
--- a/lib/pangea/toolbar/widgets/select_mode_buttons.dart
+++ b/lib/pangea/toolbar/widgets/select_mode_buttons.dart
@@ -488,25 +488,28 @@ class SelectModeButtonsState extends State<SelectModeButtons> {
         spacing: 4.0,
         children: [
           for (final mode in modes)
-            Tooltip(
-              message: _isError ? null : mode.tooltip(context),
-              child: PressableButton(
-                depressed: mode == _selectedMode,
-                borderRadius: BorderRadius.circular(20),
-                color: Theme.of(context).colorScheme.primaryContainer,
-                onPressed: () => _updateMode(mode),
-                playSound: mode != SelectMode.audio,
-                colorFactor: Theme.of(context).brightness == Brightness.light
-                    ? 0.55
-                    : 0.3,
-                child: Container(
-                  height: buttonSize,
-                  width: buttonSize,
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.primaryContainer,
-                    shape: BoxShape.circle,
+            TooltipVisibility(
+              visible: (!_isError || mode != _selectedMode),
+              child: Tooltip(
+                message: mode.tooltip(context),
+                child: PressableButton(
+                  depressed: mode == _selectedMode,
+                  borderRadius: BorderRadius.circular(20),
+                  color: Theme.of(context).colorScheme.primaryContainer,
+                  onPressed: () => _updateMode(mode),
+                  playSound: mode != SelectMode.audio,
+                  colorFactor: Theme.of(context).brightness == Brightness.light
+                      ? 0.55
+                      : 0.3,
+                  child: Container(
+                    height: buttonSize,
+                    width: buttonSize,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.primaryContainer,
+                      shape: BoxShape.circle,
+                    ),
+                    child: icon(mode),
                   ),
-                  child: icon(mode),
                 ),
               ),
             ),