Changeset 1274

Timestamp:

06/23/08 12:41:58 (3 months ago)

Author:

drobilla

Message:

Move widget embedding down to FlowCanvas.

Files:

• flowcanvas/flowcanvas/Module.hpp (modified) (3 diffs)
• flowcanvas/src/Module.cpp (modified) (2 diffs)
• ingen/src/libs/client/OSCClientReceiver.cpp (modified) (1 diff)
• ingen/src/libs/engine/JackAudioDriver.hpp (modified) (1 diff)
• ingen/src/libs/engine/QueuedEventSource.cpp (modified) (1 diff)
• ingen/src/libs/engine/QueuedEventSource.hpp (modified) (2 diffs)
• ingen/src/libs/gui/NodeModule.cpp (modified) (4 diffs)
• ingen/src/libs/gui/NodeModule.hpp (modified) (3 diffs)

flowcanvas/flowcanvas/Module.hpp

@@ -89 +89 @@
-
-        void fit_canvas();
+        
+        void embed(Gtk::Container* widget);
-
-        double _border_width;
@@ -104 +106 @@
-        Gnome::Canvas::Rect*   _stacked_border;
-        Gnome::Canvas::Pixbuf* _icon_box;
+        Gtk::Container*        _embed_container;
+        Gnome::Canvas::Widget* _embed_item;
-
-private:
@@ -114 +118 @@
-                const std::string& _name;
-        };
+        
+        void embed_size_request(Gtk::Requisition* req, bool force);
+        
+        int _last_embed_request_width;
+        int _last_embed_request_height;
-};
-

flowcanvas/src/Module.cpp

@@ -58 +58 @@
-        , _stacked_border(NULL)
-        , _icon_box(NULL)
+        , _embed_container(NULL)
+        , _embed_item(NULL)
+        , _last_embed_request_width(0)
+        , _last_embed_request_height(0)
-{
-        _module_box.property_fill_color_rgba() = MODULE_FILL_COLOUR;
@@ -419 +423 @@
-}
-
+        
+
+/** Embed a widget on the module.
+ *
+ * Resize may need to be called after this to ensure the module
+ * displays correctly.
+ */
+void
+Module::embed(Gtk::Container* widget)
+{
+        if (!widget) {
+                delete _embed_item;
+                _embed_item = NULL;
+                _ports_y_offset = 0;
+                _minimum_width = 0; // resize() will takes care of this
+                return;
+        } else {
+                _embed_container = manage(widget);
+        }
+
+        _embed_container->set_border_width(2);
+        _embed_container->show_all();
+
+        const double y = 4 + _canvas_title.property_text_height();
+        delete _embed_item;
+        _embed_item = new Gnome::Canvas::Widget(*this, 2.0, y, *_embed_container);
+        _embed_item->show();
+
+        Gtk::Requisition r = _embed_container->size_request();
+        embed_size_request(&r, true);
+
+        _embed_item->raise_to_top();
+
+        _embed_container->signal_size_request().connect(sigc::bind(
+                                sigc::mem_fun(this, &Module::embed_size_request), false));
+}
+
+        
+void
+Module::embed_size_request(Gtk::Requisition* r, bool force)
+{
+        if (!force && _last_embed_request_width == r->width && _last_embed_request_height == r->height)
+                return;
+
+        if (r->width + 4 > _width)
+                set_minimum_width(r->width + 4);
+        
+        _ports_y_offset = r->height + 2;
+        
+        resize();
+
+        Gtk::Allocation allocation;
+        allocation.set_width(r->width + 4);
+        allocation.set_height(r->height + 4);
+
+        _embed_container->size_allocate(allocation);
+        _embed_item->property_width() = _width - 4;
+        _embed_item->property_height() = r->height;
+
+        _last_embed_request_width = r->width;
+        _last_embed_request_height = r->height;
+}
+
-
-/** Resize the module to fit its contents best.

ingen/src/libs/client/OSCClientReceiver.cpp

@@ -36 +36 @@
-        , _st(NULL)
-{
-fals
+tru
-}
-

ingen/src/libs/engine/JackAudioDriver.hpp

@@ -109 +109 @@
-        bool           is_activated() const { return _is_activated; }
-        
-
+
+
+
+
+
-
-        class PortRegistrationFailedException : public std::exception {};

ingen/src/libs/engine/QueuedEventSource.cpp

@@ -62 +62 @@
-{
-        assert(!ev->is_prepared());
+
+        cerr << "[QueuedEventSource] Pushing queued @ " << ev->time() << endl;
-
-        if (_events[_back] != NULL) {

ingen/src/libs/engine/QueuedEventSource.hpp

@@ -59 +59 @@
-protected:
-        void push_queued(QueuedEvent* const ev);
-
+
+
+
-        
-        Event*        pop_earliest_queued_before(const SampleCount time);
@@ -97 +99 @@
-        Event* ret = NULL;
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-

ingen/src/libs/gui/NodeModule.cpp

@@ -41 +41 @@
-        , _node(node)
-        , _gui_widget(NULL)
-        , _gui_container(NULL)
-        , _gui_item(NULL)
-        , _gui_window(NULL)
-        , _last_gui_request_width(0)
-        , _last_gui_request_height(0)
-{
-        assert(_node);
@@ -130 +126 @@
-                        return;
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        assert(_gui_widget);
+
+                        Gtk::Container* container = new Gtk::EventBox();
+                        container->set_name("ingen_embedded_node_gui_container");
+                        container->add(*_gui_widget);
+                        FlowCanvas::Module::embed(container);
+                } else {
+                        cerr << "ERROR: Failed to create LV2 UI" << endl;
+                }
+
+                if (_gui_widget) {
-                        _gui_widget->show_all();
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                if ((*p)->type().is_control() && (*p)->is_output())
-                                        App::instance().engine()->enable_port_broadcasting((*p)->path());
-
-                } else {
-                        cerr << "ERROR: Failed to create canvas item for LV2 UI" << endl;
-                }
-
-        } else { // un-embed
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-                for (PortModelList::const_iterator p = _node->ports().begin(); p != _node->ports().end(); ++p)
@@ -199 +165 @@
-        }
-                        
-gui
+embed
-                initialise_gui_values();
-                set_base_color(0x212222FF);
@@ -207 +173 @@
-
-        resize();
-}
-
-
-void
-NodeModule::gui_size_request(Gtk::Requisition* r, bool force)
-{
-        if (!force && _last_gui_request_width == r->width && _last_gui_request_height == r->height)
-                return;
-
-        if (r->width + 4 > _width)
-                set_minimum_width(r->width + 4);
-        
-        _ports_y_offset = r->height + 2;
-        
-        resize();
-
-        Gtk::Allocation allocation;
-        allocation.set_width(r->width + 4);
-        allocation.set_height(r->height + 4);
-
-        _gui_container->size_allocate(allocation);
-        _gui_item->property_width() = _width - 4;
-        _gui_item->property_height() = r->height;
-
-        _last_gui_request_width = r->width;
-        _last_gui_request_height = r->height;
-}
-

ingen/src/libs/gui/NodeModule.hpp

@@ -69 +69 @@
-        
-        void show_control_window();
+        void embed_gui(bool embed);
-        bool popup_gui();
-        void on_gui_window_close();
@@ -79 +80 @@
-
-        void value_changed(uint32_t index, const Atom& value);
-
-        void embed_gui(bool embed);
-        void gui_size_request(Gtk::Requisition* req, bool force);
-        void initialise_gui_values();
-
@@ -90 +88 @@
-        SharedPtr<PluginUI>    _plugin_ui;
-        Gtk::Widget*           _gui_widget;
-        Gtk::Container*        _gui_container;
-        Gnome::Canvas::Widget* _gui_item; ///< iff embedded
-        Gtk::Window*           _gui_window; ///< iff popped up
-        int                    _last_gui_request_width;
-        int                    _last_gui_request_height;
-};
-