fix: correct selection after grouping layers (synfig#3660)

Author: omda777

synfig-studio/src/gui/trees/layertree.cpp

@@ -426,9 +426,13 @@ LayerTree::select_layer(synfig::Layer::Handle layer)
 			iter=sorted_layer_tree_store_->convert_child_iter_to_iter(iter);
 
 		Gtk::TreePath path(iter);
-		layer_tree_view().expand_to_path(path);
+		// do not auto expand when selecting a group layer to avoid "opening" it on selection
+		if(!(layer->get_name() == "group"))
+			layer_tree_view().expand_to_path(path);
+
 		layer_tree_view().scroll_to_row(path);
 		layer_tree_view().get_selection()->select(iter);
+		layer_tree_view().set_cursor(path);
 	}
 }
 

synfig-studio/src/synfigapp/actions/layerencapsulate.cpp

@@ -160,7 +160,7 @@ Action::LayerEncapsulate::prepare()
 	if(!child_canvas)
 		child_canvas=Canvas::create_inline(get_canvas());
 
-	Layer::Handle new_layer(Layer::create("group"));
+	new_layer=Layer::create("group");
 
 	if (!description.empty())
 		new_layer->set_description(description);
@@ -246,3 +246,13 @@ Action::LayerEncapsulate::prepare()
 		}
 	}
 }
+
+void
+Action::LayerEncapsulate::perform()
+{
+	Super::perform();
+	if(new_layer && get_canvas_interface()){
+		get_canvas_interface()->get_selection_manager()->clear_selected_layers();
+		get_canvas_interface()->get_selection_manager()->set_selected_layer(new_layer);
+	}
+}

synfig-studio/src/synfigapp/actions/layerencapsulate.h

@@ -54,6 +54,7 @@ class LayerEncapsulate :
 	std::list<synfig::Layer::Handle> layers;
         bool children_lock;
 
+	synfig::Layer::Handle new_layer;
 	int lowest_depth()const;
 
 public:
@@ -67,6 +68,7 @@ class LayerEncapsulate :
 	virtual bool is_ready()const;
 
 	virtual void prepare();
+	virtual void perform();
 
 	ACTION_MODULE_EXT
 };