Close tabs with middle-click

gpanthera.cc

@@ -848,16 +848,7 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            848  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            849  
                                                    auto close_action = Gio::SimpleAction::create("close");
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            850  
                                                    close_action->signal_activate().connect([this](const Glib::VariantBase&) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        851 -
                                                    if(!this->page->signal_close.emit()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        852 -
                                                        if(this->page->get_next_sibling()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        853 -
                                                            this->page->content_manager->set_last_operated_page(static_cast<ContentPage*>(this->page->get_next_sibling()));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        854 -
                                                            this->page->get_stack()->set_visible_child(*this->page->get_next_sibling());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        855 -
                                                        } else if(this->page->get_prev_sibling()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        856 -
                                                            this->page->content_manager->set_last_operated_page(static_cast<ContentPage*>(this->page->get_prev_sibling()));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        857 -
                                                            this->page->get_stack()->set_visible_child(*this->page->get_prev_sibling());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        858 -
                                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        859 -
                                                        this->page->redock(nullptr);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        860 -
                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        851 +
                                                    this->close();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            852  
                                                    });
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            853  
                                                    action_group->add_action(close_action);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            854  
                                                    context_menu->append(_("Close"), "win.close");
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -911,6 +902,25 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            902  
                                                            popover->popup();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            903  
                                                        }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            904  
                                                    });
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        905 +
                                                auto middle_click_controller = Gtk::GestureClick::create();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        906 +
                                                middle_click_controller->set_button(2);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        907 +
                                                middle_click_controller->signal_released().connect([this](int num_presses, double x, double y) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        908 +
                                                    this->close();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        909 +
                                                });
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        910 +
                                                this->add_controller(middle_click_controller);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        911 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        912 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        913 +
                                            void ContentTab::close() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        914 +
                                                if(!this->page->signal_close.emit()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        915 +
                                                    if(this->page->get_next_sibling()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        916 +
                                                        this->page->content_manager->set_last_operated_page(static_cast<ContentPage*>(this->page->get_next_sibling()));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        917 +
                                                        this->page->get_stack()->set_visible_child(*this->page->get_next_sibling());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        918 +
                                                    } else if(this->page->get_prev_sibling()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        919 +
                                                        this->page->content_manager->set_last_operated_page(static_cast<ContentPage*>(this->page->get_prev_sibling()));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        920 +
                                                        this->page->get_stack()->set_visible_child(*this->page->get_prev_sibling());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        921 +
                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        922 +
                                                    this->page->redock(nullptr);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        923 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            924  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            925  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            926  
                                                void ContentTab::update_active_style() {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

gpanthera.hh

@@ -152,6 +152,7 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            152  
                                                    void update_active_style();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            153  
                                                    sigc::connection active_style_handler;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            154  
                                                public:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        155 +
                                                void close();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            156  
                                                    explicit ContentTab(ContentPage *page);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            157  
                                                    ContentPage *page;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            158  
                                                    ~ContentTab() override;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

panthera-www.cc

@@ -38,7 +38,7 @@ protected:

                                
                                
                                
                            
                                
                                    
                                        
                                            38  
                                                    gtk_widget_set_vexpand(GTK_WIDGET(webview), true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                                    auto page_content = Gtk::make_managed<Gtk::Box>();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            40  
                                                    gtk_box_append(page_content->gobj(), GTK_WIDGET(webview));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 -
                                                auto page_tab = new Gtk::Label("Tab");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 +
                                                auto page_tab = new Gtk::Label("Untitled");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            42  
                                                    auto page = Gtk::make_managed<gPanthera::ContentPage>(content_manager, stack, page_content, page_tab);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            43  
                                                    g_signal_connect(webview, "notify", G_CALLBACK(notify_callback), page->gobj());
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            44  
                                                    webkit_web_view_load_uri(webview, "about:blank");