X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkmm2ext%2Fgtkmm2ext%2Fdndvbox.h;h=bc5ca6c7255dbef61a2272cd7574f97e32e400f7;hb=23973bae24b7f569e26c7f869a103aacbaf66ab2;hp=166544d73fb02319e1997ff1fb49b8f40296906a;hpb=673a995e5c718bc6aa994c50a70deb6f96e3eb59;p=ardour.git diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index 166544d73f..bc5ca6c725 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -18,6 +18,7 @@ */ #include +#include "gtkmm2ext/widget_state.h" namespace Gtkmm2ext { @@ -35,6 +36,9 @@ public: /** @return Text to use in the icon that is dragged */ virtual std::string drag_text () const = 0; + + /** Set the child's visual state */ + virtual void set_visual_state (VisualState, bool onoff) = 0; }; /** A VBox whose contents can be dragged and dropped */ @@ -42,15 +46,23 @@ template class DnDVBox : public Gtk::EventBox { public: - DnDVBox () : _drag_icon (0), _expecting_unwanted_button_event (false) + DnDVBox () : _active (0), _drag_icon (0), _expecting_unwanted_button_event (false), _placeholder (0) { _targets.push_back (Gtk::TargetEntry ("processor")); add (_internal_vbox); - add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); - - signal_button_press_event().connect (bind (mem_fun (*this, &DnDVBox::button_press), (T *) 0)); - signal_button_release_event().connect (bind (mem_fun (*this, &DnDVBox::button_release), (T *) 0)); + add_events ( + Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK | + Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | + Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK + ); + + signal_button_press_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_press), (T *) 0)); + signal_button_release_event().connect (sigc::bind (mem_fun (*this, &DnDVBox::button_release), (T *) 0)); + signal_drag_motion().connect (mem_fun (*this, &DnDVBox::drag_motion)); + signal_drag_leave().connect (mem_fun (*this, &DnDVBox::drag_leave)); + + _internal_vbox.show (); drag_dest_set (_targets); signal_drag_data_received().connect (mem_fun (*this, &DnDVBox::drag_data_received)); @@ -76,7 +88,7 @@ public: _internal_vbox.pack_start (child->widget(), false, false); _children.push_back (child); - child->widget().show_all (); + child->widget().show (); } /** @return Children, sorted into the order that they are currently being displayed in the widget */ @@ -101,8 +113,24 @@ public: return _selection; } - /** @param Child - * @return true if the child is selected, otherwise false */ + /** Set the `active' child; this is simply a child which is set to have the + * visual state "active" for whatever purposes the client may have. + * @param c Child, or 0 for none. + */ + void set_active (T* c) { + T* old_active = _active; + _active = c; + if (old_active) { + setup_child_state (old_active); + } + if (_active) { + setup_child_state (_active); + } + } + + /** @param child Child + * @return true if the child is selected, otherwise false. + */ bool selected (T* child) const { return (find (_selection.begin(), _selection.end(), child) != _selection.end()); } @@ -118,9 +146,9 @@ public: } _children.clear (); + _active = 0; } - void select_all () { clear_selection (); @@ -138,32 +166,42 @@ public: SelectionChanged (); /* EMIT SIGNAL */ } - /** @param x x coordinate. - * @param y y coordinate. - * @return Pair consisting of the child under (x, y) (or 0) and the index of the child under (x, y) (or -1) + /** @param y y coordinate. + * @return Pair consisting of the child under y (or 0) and the (fractional) index of the child under y (or -1) */ - std::pair get_child_at_position (int x, int y) const + std::pair get_child_at_position (int y) const { - std::list children = _internal_vbox.get_children (); - std::list::iterator i = children.begin(); - - int n = 0; - while (i != children.end()) { - Gdk::Rectangle const a = (*i)->get_allocation (); - if (y >= a.get_y() && y <= (a.get_y() + a.get_height())) { - break; - } - ++i; - ++n; - } + T* before; + T* after; + + std::pair r; - if (i == children.end()) { - return std::make_pair ((T *) 0, -1); - } + r.second = get_children_around_position (y, &before, &r.first, &after); - return std::make_pair (child_from_widget (*i), n); - } + return r; + } + void set_spacing (int s) { + _internal_vbox.set_spacing (s); + } + + void remove_placeholder () + { + if (_placeholder) { + _internal_vbox.remove (*_placeholder); + _placeholder = 0; + } + } + + /** Add a placeholder where a child would be put if it were added at the given y position. + * @param y y position within the DnDVBox. + * @return index of child that the placeholder represents, or -1 if it is at the end of all children. + */ + int add_placeholder (double y) + { + return create_or_update_placeholder (get_child_at_position (y).second); + } + /** Children have been reordered by a drag */ sigc::signal Reordered; @@ -180,21 +218,122 @@ public: sigc::signal SelectionChanged; private: + + /** @return the bottom y position of a child, pretending any placeholder + * is not there. + */ + double bottom_of_child_ignoring_placeholder (T* child) const + { + Gtk::Allocation const a = child->widget().get_allocation (); + double bottom = a.get_y() + a.get_height(); + + if (_placeholder) { + Gtk::Allocation const b = _placeholder->get_allocation (); + if (b.get_y() < a.get_y()) { + bottom -= (b.get_height () + _internal_vbox.get_spacing ()); + } + } + + return bottom; + } + + /** Look at a y coordinate and find the children below y, and the ones either side. + * @param y y position. + * @param before Filled in with the child before, or 0. + * @param at Filled in with the child under y, or 0. + * @param after Filled in with the child after, or 0. + * @return Fractional position in terms of child height, or -1 if not over a child. + */ + double get_children_around_position (int y, T** before, T** at, T** after) const + { + if (_children.empty()) { + *before = *at = *after = 0; + return -1; + } + + *before = 0; + + typename std::list::const_iterator j = _children.begin (); + + /* index of current child */ + int i = 0; + /* top of current child */ + double top = 0; + /* bottom of current child */ + double bottom = bottom_of_child_ignoring_placeholder (*j); + + while (y >= bottom && j != _children.end()) { + + top = bottom; + + *before = *j; + ++i; + ++j; + + if (j != _children.end()) { + bottom = bottom_of_child_ignoring_placeholder (*j); + } + } + + if (j == _children.end()) { + *at = 0; + *after = 0; + return -1; + } + + *at = *j; + + ++j; + *after = j != _children.end() ? *j : 0; + + return i + ((y - top) / (bottom - top)); + } + void drag_begin (Glib::RefPtr const & context, T* child) { + _drag_child = child; + /* make up an icon for the drag */ - Gtk::Window* _drag_icon = new Gtk::Window (Gtk::WINDOW_POPUP); + _drag_icon = new Gtk::Window (Gtk::WINDOW_POPUP); + + Gtk::Allocation a = child->widget().get_allocation (); + _drag_icon->set_size_request (a.get_width(), a.get_height()); + + _drag_icon->signal_expose_event().connect (sigc::mem_fun (*this, &DnDVBox::icon_expose)); _drag_icon->set_name (get_name ()); - Gtk::Label* l = new Gtk::Label (child->drag_text ()); - l->set_padding (4, 4); - _drag_icon->add (*Gtk::manage (l)); - _drag_icon->show_all_children (); + + /* make the icon transparent if possible */ + Glib::RefPtr s = _drag_icon->get_screen (); + Glib::RefPtr c = s->get_rgba_colormap (); + if (c) { + _drag_icon->set_colormap (c); + } + int w, h; _drag_icon->get_size (w, h); - _drag_icon->drag_set_as_icon (context, w / 2, h); + _drag_icon->drag_set_as_icon (context, w / 2, h / 2); _drag_source = this; } + + /* Draw the drag icon */ + bool icon_expose (GdkEventExpose*) + { + /* Just grab the child's widget and use that */ + + int w, h; + _drag_icon->get_size (w, h); + + cairo_t* cr = gdk_cairo_create (_drag_icon->get_window()->gobj ()); + + Glib::RefPtr p = _drag_child->widget().get_snapshot(); + gdk_cairo_set_source_pixmap (cr, p->gobj(), 0, 0); + cairo_rectangle (cr, 0, 0, w, h); + cairo_fill (cr); + cairo_destroy (cr); + + return false; + } void drag_data_get (Glib::RefPtr const &, Gtk::SelectionData & selection_data, guint, guint, T* child) { @@ -202,23 +341,39 @@ private: } void drag_data_received ( - Glib::RefPtr const & context, int x, int y, Gtk::SelectionData const & selection_data, guint info, guint time + Glib::RefPtr const & context, int /*x*/, int y, Gtk::SelectionData const & selection_data, guint /*info*/, guint time ) { /* work out where it was dropped */ - std::pair const drop = get_child_at_position (x, y); + std::pair const drop = get_child_at_position (y); if (_drag_source == this) { /* dropped from ourselves onto ourselves */ - + T* child = *((T **) selection_data.get_data()); - - /* reorder child widgets accordingly */ + if (drop.first == 0) { _internal_vbox.reorder_child (child->widget(), -1); } else { - _internal_vbox.reorder_child (child->widget(), drop.second); + + /* where in the list this child should be dropped */ + int target = drop.second + 0.5; + + /* find out whether the child was `picked up' from before the drop position */ + int n = 0; + typename std::list::const_iterator i = _children.begin (); + while (i != _children.end() && *i != child && n < target) { + ++i; + ++n; + } + + /* if so, adjust the drop position to account for this */ + if (n < target) { + --target; + } + + _internal_vbox.reorder_child (child->widget(), target); } } else { @@ -236,10 +391,74 @@ private: { delete _drag_icon; _drag_icon = 0; + + _drag_child = 0; + remove_placeholder (); Reordered (); /* EMIT SIGNAL */ } - + + /** Insert a placeholder at a given fractional child position, creating it if necessary. + * @param c Fractional child position. + * @return index of child that the placeholder represents, or -1 if it is at the end of all children. + */ + int create_or_update_placeholder (double c) + { + if (_placeholder == 0) { + _placeholder = manage (new Gtk::Label ("")); + _internal_vbox.pack_start (*_placeholder, false, false); + _placeholder->show (); + } + + /* round up the index, unless we're off the end of the children */ + int const n = c < 0 ? -1 : int (c + 0.5); + _internal_vbox.reorder_child (*_placeholder, n); + return n; + } + + bool drag_motion (Glib::RefPtr const &, int /*x*/, int y, guint) + { + if (_children.empty ()) { + return false; + } + + T* before; + T* at; + T* after; + + /* decide where we currently are */ + double const c = get_children_around_position (y, &before, &at, &after); + + /* whether we're in the top or bottom half of the child that we're over */ + bool top_half = (c - int (c)) < 0.5; + + /* Note that when checking on whether to remove a placeholder, we never do + so if _drag_child is 0 as this means that the child being dragged is + coming from a different DnDVBox, so it will never be the same as any + of our children. + */ + + if (top_half && _drag_child && (before == _drag_child || at == _drag_child)) { + /* dropping here would have no effect, so remove the visual cue */ + remove_placeholder (); + return false; + } + + if (!top_half && _drag_child && (at == _drag_child || after == _drag_child)) { + /* dropping here would have no effect, so remove the visual cue */ + remove_placeholder (); + return false; + } + + create_or_update_placeholder (c); + return false; + } + + void drag_leave (Glib::RefPtr const &, guint) + { + remove_placeholder (); + } + bool button_press (GdkEventButton* ev, T* child) { if (_expecting_unwanted_button_event == true && child == 0) { @@ -252,12 +471,52 @@ private: } if (ev->button == 1 || ev->button == 3) { + if (!selected (child)) { - clear_selection (); - if (child) { - add_to_selection (child); + + if ((ev->state & Gdk::SHIFT_MASK) && !_selection.empty()) { + + /* Shift-click; select all between the clicked child and any existing selections */ + + bool selecting = false; + bool done = false; + for (typename std::list::const_iterator i = _children.begin(); i != _children.end(); ++i) { + + bool const was_selected = selected (*i); + + if (selecting && !was_selected) { + add_to_selection (*i); + } + + if (!selecting && !done) { + if (selected (*i)) { + selecting = true; + } else if (*i == child) { + selecting = true; + add_to_selection (child); + } + } else if (selecting) { + if (was_selected || *i == child) { + selecting = false; + done = true; + } + } + } + + } else { + + if ((ev->state & Gdk::CONTROL_MASK) == 0) { + clear_selection (); + } + + if (child) { + add_to_selection (child); + } + } + SelectionChanged (); /* EMIT SIGNAL */ + } else { /* XXX THIS NEEDS GENERALIZING FOR OS X */ if (ev->button == 1 && (ev->state & Gdk::CONTROL_MASK)) { @@ -269,7 +528,6 @@ private: } } - return ButtonPress (ev, child); /* EMIT SIGNAL */ } @@ -287,27 +545,35 @@ private: return ButtonRelease (ev, child); /* EMIT SIGNAL */ } + /** Setup a child's visual state correctly */ + void setup_child_state (T* c) + { + assert (c); + c->set_visual_state (Selected, (selected (c) || (_active == c))); + } + void clear_selection () { - for (typename std::list::iterator i = _selection.begin(); i != _selection.end(); ++i) { - (*i)->action_widget().set_state (Gtk::STATE_NORMAL); - } + std::list old_selection = _selection; _selection.clear (); + for (typename std::list::iterator i = old_selection.begin(); i != old_selection.end(); ++i) { + setup_child_state (*i); + } } void add_to_selection (T* child) { - child->action_widget().set_state (Gtk::STATE_SELECTED); _selection.push_back (child); + setup_child_state (child); } - - + void remove_from_selection (T* child) { typename std::list::iterator x = find (_selection.begin(), _selection.end(), child); if (x != _selection.end()) { - child->action_widget().set_state (Gtk::STATE_NORMAL); + T* c = *x; _selection.erase (x); + setup_child_state (c); } } @@ -329,10 +595,18 @@ private: std::list _targets; std::list _children; std::list _selection; + T* _active; Gtk::Window* _drag_icon; bool _expecting_unwanted_button_event; - + /** A blank label used as a placeholder to indicate where an item would + * go if it were dropped or inserted "now". + */ + Gtk::Label* _placeholder; + /** Our child being dragged, or 0 */ + T* _drag_child; + static DnDVBox* _drag_source; + }; template