A few more focus-grabbing fixes

gpanthera.cc

@@ -769,6 +769,15 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            769  
                                                                child->insert_after(*box, *paned);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            770  
                                                                paned->unparent();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            771  
                                                                g_object_unref(child->gobj());
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        772 +
                                                        } else if(auto window = dynamic_cast<Gtk::Window*>(paned->get_parent())) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        773 +
                                                            window->set_child(*child);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        774 +
                                                            g_object_unref(child->gobj());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        775 +
                                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        776 +
                                                        // Focus the visible page of the former pane's other child
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        777 +
                                                        if(auto stack = dynamic_cast<ContentStack*>(child->get_last_child())) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        778 +
                                                            if(auto page = dynamic_cast<ContentPage*>(stack->get_visible_child())) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        779 +
                                                                content_manager->set_last_operated_page(page);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        780 +
                                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            781  
                                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            782  
                                                        }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            783  
                                                    }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1012,7 +1021,11 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            1021  
                                                        content_manager->signal_page_closing.emit(this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1022  
                                                        if(this->stack) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1023  
                                                            this->stack->remove(*this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1015 -
                                                        if(dynamic_cast<ContentNotebook*>(this->stack->get_parent()) && !this->stack->get_first_child()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1024 +
                                                        /*
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1025 +
                                                        The stack may be removed, for example, if the application closes its window if
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1026 +
                                                        it was the sole stack inside. Thus, it must be re-checked.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1027 +
                                                        */
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1028 +
                                                        if(this->stack && dynamic_cast<ContentNotebook*>(this->stack->get_parent()) && !this->stack->get_first_child()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1029  
                                                                this->stack->remove_with_paned();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1030  
                                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1031  
                                                        }