Changeset 1276

Timestamp:

06/23/08 14:51:11 (3 months ago)

Author:

drobilla

Message:

Arrange embedded widgets more sanely if placing ports below GUI doesn't work well.

Files:

• flowcanvas/flowcanvas/Module.hpp (modified) (3 diffs)
• flowcanvas/src/Module.cpp (modified) (7 diffs)

flowcanvas/flowcanvas/Module.hpp

@@ -78 +78 @@
-        size_t num_ports() const { return _ports.size(); }
-
-        void   set_ports_y_offset(double offset)   { _ports_y_offset = offset; }
-        double ports_y_offset(double offset) const { return _ports_y_offset; }
-
-protected:
-        virtual void on_drop(double new_x, double new_y);
@@ -94 +91 @@
-        double _border_width;
-        bool   _title_visible;
-
+
+
-        double _icon_size;
-
-        double _widest_input;
-        double _widest_output;
@@ -120 +117 @@
-        
-        void embed_size_request(Gtk::Requisition* req, bool force);
-        
-        int _last_embed_request_width;
-        int _last_embed_request_height;
-};
-

flowcanvas/src/Module.cpp

@@ -50 +50 @@
-        , _border_width(1.0)
-        , _title_visible(show_title)
-
+
+
-        , _icon_size(16)
-        , _widest_input(0)
@@ -60 +61 @@
-        , _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;
@@ -436 +435 @@
-                delete _embed_item;
-                _embed_item = NULL;
-ports_y_offset
-minimum_width = 0; // resize() will takes care of this
+embed_width
+embed_height = 0;
-                return;
-        } else {
@@ -464 +463 @@
-Module::embed_size_request(Gtk::Requisition* r, bool force)
-{
-last_embed_request_width == r->width && _last_embed_request
+embed_width == r->width && _embed
-                return;
-
-if (r->width + 4 > _width)
-       set_minimum_width(r->width + 4)
-
-_ports_y_offset = r->height + 2
-
+_embed_width = r->width;
+_embed_height = r->height
+
+cerr << "*** EMBED WIDTH: " << r->width << endl
+
-        resize();
-
@@ -479 +478 @@
-
-        _embed_container->size_allocate(allocation);
-_
+r->
-        _embed_item->property_height() = r->height;
-
-        _last_embed_request_width = r->width;
-        _last_embed_request_height = r->height;
-}
-
@@ -494 +490 @@
-        // The amount of space between a port edge and the module edge (on the
-        // side that the port isn't right on the edge).
-8.0 : 16
+10.0 : 20
-        
-        double width = (_title_visible
-8
+10
-                : 1.0);
-        
@@ -504 +500 @@
-
-        // Fit ports to module (or vice-versa)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        width += _border_width * 2.0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        // Move ports to appropriate locations
-        
-        int i = 0;
-        for (PortVector::iterator pi = _ports.begin(); pi != _ports.end(); ++pi, ++i) {
-                const boost::shared_ptr<Port> p = (*pi);
-
-ight_base
+ader_height
-                if (p->is_input()) {
-_widest_input
+widest_in
-                        p->property_x() = 0.5;
-                        p->property_y() = y;
-                } else {
-_widest_outp
+widest_o
-                        p->property_x() = _width - p->width() - 0.5;
-                        p->property_y() = y;