fix #1178 #1180

Author: alainm23

core/QuickAdd.vala

@@ -20,6 +20,7 @@ public class Layouts.QuickAdd : Adw.Bin {
 
     public bool ctrl_pressed { get; set; default = false; }
     public bool shift_pressed { get; set; default = false; }
+    public bool create_more { get; set; default = Services.Settings.get_default ().settings.get_boolean ("quick-add-create-more"); }
 
     public QuickAdd (bool is_window_quick_add = false) {
         Object (
@@ -215,7 +216,6 @@ public class Layouts.QuickAdd : Adw.Bin {
             return GLib.Source.REMOVE;
         });
 
-        content_entry.activate.connect (add_item);
         submit_button.clicked.connect (add_item);
 
         project_picker_button.project_change.connect ((project) => {
@@ -259,6 +259,23 @@ public class Layouts.QuickAdd : Adw.Bin {
             return false;
         });
 
+        content_entry.activate.connect (() => {
+            create_more = Services.Settings.get_default ().settings.get_boolean ("quick-add-create-more");
+            add_item ();
+        });
+
+        var content_controller_key = new Gtk.EventControllerKey ();
+        content_entry.add_controller (content_controller_key);
+        content_controller_key.key_pressed.connect ((keyval, keycode, state) => {
+            if (keyval == 65293 && (ctrl_pressed || shift_pressed)) {
+                create_more = true;
+                add_item ();
+                return false;
+            }
+
+            return false;
+        });
+
         var description_controller_key = new Gtk.EventControllerKey ();
         description_textview.add_controller (description_controller_key);
         description_controller_key.key_pressed.connect ((keyval, keycode, state) => {
@@ -306,6 +323,10 @@ public class Layouts.QuickAdd : Adw.Bin {
         if (item.project.backend_type == BackendType.LOCAL) {
             item.id = Util.get_default ().generate_id ();
             add_item_db (item);
+
+            if (item.parent_id != "") {
+                item.parent.collapsed = true;
+            }
         } else if (item.project.backend_type == BackendType.TODOIST) {
             submit_button.is_loading = true;
             Services.Todoist.get_default ().add.begin (item, (obj, res) => {
@@ -315,6 +336,10 @@ public class Layouts.QuickAdd : Adw.Bin {
                 if (response.status) {
                     item.id = response.data;
                     add_item_db (item);
+                    
+                    if (item.parent_id != "") {
+                        item.parent.collapsed = true;
+                    }
                 }
             });
         } else if (item.project.backend_type == BackendType.CALDAV) {
@@ -326,6 +351,10 @@ public class Layouts.QuickAdd : Adw.Bin {
 
                 if (response.status) {
                     add_item_db (item);
+                    
+                    if (item.parent_id != "") {
+                        item.parent.collapsed = true;
+                    }
                 }
             });
         }
@@ -336,7 +365,7 @@ public class Layouts.QuickAdd : Adw.Bin {
         added_image.add_css_class ("fancy-turn-animation");
 
         Timeout.add (750, () => {
-            if (Services.Settings.get_default ().settings.get_boolean ("quick-add-create-more")) {
+            if (create_more) {
                 main_stack.visible_child_name = "main";
                 added_image.remove_css_class ("fancy-turn-animation");
 

src/Layouts/ItemRow.vala

@@ -736,7 +736,9 @@ public class Layouts.ItemRow : Layouts.ItemBase {
     }
 
     public void check_hide_subtask_button () {
-        hide_subtask_revealer.reveal_child = subitems.has_children;
+        if (!edit) {
+            hide_subtask_revealer.reveal_child = subitems.has_children;
+        }
     }
 
     private void selected_toggled (bool active) {

src/MainWindow.vala

@@ -27,6 +27,7 @@ public class MainWindow : Adw.ApplicationWindow {
 	private Adw.OverlaySplitView overlay_split_view;
 	private Gtk.MenuButton settings_button;
 	private Layouts.ItemSidebarView item_sidebar_view;
+	private Gtk.Button fake_button;
 
 	public Services.ActionManager action_manager;
 
@@ -60,6 +61,10 @@ public class MainWindow : Adw.ApplicationWindow {
 
 		var settings_popover = build_menu_app ();
 
+		fake_button = new Gtk.Button () {
+			visible = false
+		};
+
 		settings_button = new Gtk.MenuButton () {
 			css_classes = { "flat" },
 			popover = settings_popover,
@@ -79,6 +84,7 @@ public class MainWindow : Adw.ApplicationWindow {
 		sidebar_header.add_css_class ("flat");
 		sidebar_header.pack_end (settings_button);
 		sidebar_header.pack_end (search_button);
+		sidebar_header.pack_end (fake_button);
 
 		sidebar = new Layouts.Sidebar ();
 
@@ -122,6 +128,7 @@ public class MainWindow : Adw.ApplicationWindow {
 		Timeout.add (250, () => {
 			init_backend ();
 			overlay_split_view.show_sidebar = true;
+			fake_button.grab_focus ();
 			return GLib.Source.REMOVE;
 		});
 
@@ -265,7 +272,7 @@ public class MainWindow : Adw.ApplicationWindow {
 		views_split_view.notify["show-sidebar"].connect (() => {
 			if (!views_split_view.show_sidebar) {
 				item_sidebar_view.disconnect_all ();
-				search_button.grab_focus ();
+				fake_button.grab_focus ();
 			}
 		});
 	}