ardour/livetrax
13
0
Fork 0
Code

Fix problems with dragging route groups so that they are too small.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5240 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-06-22 00:33:31 +00:00
parent cfbec44c33
commit 442eef90ab
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_group_tabs.cc
View File

@ -53,12 +53,14 @@ EditorGroupTabs::compute_tabs () const
if (g != tab.group) { if (g != tab.group) {
if (tab.group) { if (tab.group) {
tab.to = y; tab.to = y;
tab.last_ui_size = (*i)->effective_height ();
tabs.push_back (tab); tabs.push_back (tab);
} }
tab.from = y; tab.from = y;
tab.group = g; tab.group = g;
tab.colour = (*i)->color (); tab.colour = (*i)->color ();
tab.first_ui_size = (*i)->effective_height ();
} }
y += (*i)->effective_height (); y += (*i)->effective_height ();

17
gtk2_ardour/group_tabs.cc
View File

@ -114,16 +114,33 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev)
} }
if (_drag_from) { if (_drag_from) {
double f = _dragging->from + p - _drag_last; double f = _dragging->from + p - _drag_last;
if (f < _drag_limit) { if (f < _drag_limit) {
f = _drag_limit; f = _drag_limit;
} }
double const t = _dragging->to - _dragging->last_ui_size;
if (f > t) {
f = t;
}
_dragging->from = f; _dragging->from = f;
} else { } else {
double t = _dragging->to + p - _drag_last; double t = _dragging->to + p - _drag_last;
if (t > _drag_limit) { if (t > _drag_limit) {
t = _drag_limit; t = _drag_limit;
} }
double const f = _dragging->from + _dragging->first_ui_size;
if (t < f) {
t = f;
}
_dragging->to = t; _dragging->to = t;
} }

2
gtk2_ardour/group_tabs.h
View File

@ -41,6 +41,8 @@ protected:
double to; double to;
Gdk::Color colour; Gdk::Color colour;
ARDOUR::RouteGroup* group; ARDOUR::RouteGroup* group;
double first_ui_size;
double last_ui_size;
}; };
private: private:

2
gtk2_ardour/mixer_group_tabs.cc
View File

@ -55,12 +55,14 @@ MixerGroupTabs::compute_tabs () const
if (g != tab.group) { if (g != tab.group) {
if (tab.group) { if (tab.group) {
tab.to = x; tab.to = x;
tab.last_ui_size = (*i)->get_width ();
tabs.push_back (tab); tabs.push_back (tab);
} }
tab.from = x; tab.from = x;
tab.group = g; tab.group = g;
tab.colour = (*i)->color (); tab.colour = (*i)->color ();
tab.first_ui_size = (*i)->get_width ();
} }
x += (*i)->get_width (); x += (*i)->get_width ();