Fix splitting with webviews

gpanthera.cc

@@ -6,6 +6,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            6  
                                            #include <libintl.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                            #include <locale.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                            #include <filesystem>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        9 +
                                        #include <ranges>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            10  
                                            #define _(STRING) gettext(STRING)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            11  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            12  
                                            namespace gPanthera {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -459,6 +460,20 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            460  
                                                    signal_child_removed.emit(&child);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            461  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            462  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        463 +
                                            void ContentStack::disable_children() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        464 +
                                                auto children = collect_children(*this);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        465 +
                                                for(auto *child : children) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        466 +
                                                    child->set_can_target(false);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        467 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        468 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        469 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        470 +
                                            void ContentStack::enable_children() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        471 +
                                                auto children = collect_children(*this);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        472 +
                                                for(auto *child : children) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        473 +
                                                    child->set_can_target(true);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        474 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        475 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        476 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            477  
                                                ContentStack::ContentStack(std::shared_ptr<ContentManager> content_manager, std::function<bool(ContentPage*)> detach_handler)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            478  
                                                    : BaseStack(), content_manager(std::move(content_manager)) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            479  
                                                    this->set_name("gpanthera_content_stack");
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -472,8 +487,18 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            487  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            488  
                                                    drop_target = Gtk::DropTarget::create(ContentPage::get_type(), Gdk::DragAction::MOVE);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            489  
                                                    this->add_controller(drop_target);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        490 +
                                                // Some widgets (such as webviews) will consume anything dropped on their ancestors. We have
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        491 +
                                                // to disable all child widgets to ensure the drop can be caught by this widget.
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        492 +
                                                drop_target->signal_enter().connect([this](double x, double y) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        493 +
                                                    disable_children();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        494 +
                                                    return Gdk::DragAction::MOVE;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        495 +
                                                }, false);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        496 +
                                                drop_target->signal_leave().connect([this]() {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        497 +
                                                    enable_children();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        498 +
                                                }, false);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            499  
                                                    // Process dropped buttons
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            500  
                                                    drop_target->signal_drop().connect([this](const Glib::ValueBase &value, double x, double y) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        501 +
                                                    enable_children();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            502  
                                                        const auto &widget = static_cast<const Glib::Value<ContentPage*>&>(value).get();
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            503  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            504  
                                                        if(auto page = dynamic_cast<ContentPage*>(widget)) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

gpanthera.hh

@@ -153,6 +153,9 @@ namespace gPanthera {

                                
                                
                                
                            
                                
                                    
                                        
                                            153  
                                                };
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            154  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            155  
                                                class ContentStack : public BaseStack {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        156 +
                                            private:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        157 +
                                                void disable_children();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        158 +
                                                void enable_children();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            159  
                                                protected:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            160  
                                                    std::function<bool(ContentPage*)> detach_handler;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            161  
                                                public:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

panthera-www.cc

@@ -7,6 +7,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            7  
                                            #include <libintl.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            8  
                                            #include <locale.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            9  
                                            #include <gtk/gtk.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        10 +
                                        #include <gdk/gdk.h>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            11  
                                            #include <webkit/webkit.h>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            12  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            13  
                                            class PantheraWww : public Gtk::Application {