[geary/mjog/responsive-layout-fixes: 20/23] client: Only enable find-in-conversation action when the viewer is shown




commit 45bab34f45b5e3c9bf2cca6c2cdf540ff8ec271a
Author: Michael Gratton <mike vee net>
Date:   Wed Apr 14 08:55:00 2021 +1000

    client: Only enable find-in-conversation action when the viewer is shown

 src/client/application/application-main-window.vala | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/src/client/application/application-main-window.vala 
b/src/client/application/application-main-window.vala
index 21bc996cf..fde9aa2de 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1807,7 +1807,7 @@ public class Application.MainWindow :
         bool multiple = (count == MULTIPLE);
 
         get_window_action(ACTION_FIND_IN_CONVERSATION).set_enabled(
-            sensitive && !multiple
+            sensitive && !multiple && this.is_conversation_viewer_shown
         );
 
         bool reply_sensitive = (
@@ -1846,11 +1846,6 @@ public class Application.MainWindow :
             sensitive && (selected_folder is Geary.FolderSupport.Remove)
         );
 
-        this.update_context_dependent_actions.begin(sensitive);
-        update_conversation_list_actions_revealer(count);
-    }
-
-    private void update_conversation_list_actions_revealer(ConversationCount count) {
         switch (count) {
         case NONE:
             this.conversation_list_actions_revealer.reveal_child = false;
@@ -1864,6 +1859,8 @@ public class Application.MainWindow :
             this.conversation_list_actions_revealer.reveal_child = true;
             break;
         }
+
+        this.update_context_dependent_actions.begin(sensitive);
     }
 
     private void update_trash_action() {
@@ -2106,7 +2103,7 @@ public class Application.MainWindow :
     [GtkCallback]
     private void on_outer_leaflet_changed() {
         int selected = this.conversation_list_view.get_selected().size;
-        update_conversation_list_actions_revealer(
+        update_conversation_actions(
             ConversationCount.for_size(selected)
         );
         if (this.has_composer &&


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]