summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-06-26 01:53:36 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-06-26 01:53:36 +0000
commitf509da7043222197c2efce7ab0a816626ef9ab54 (patch)
treed30533a80bed4e89e29cdf6484574d03b3754bfc /gtk2_ardour/time_axis_view.cc
parent4c00b9a98a5f8d8b8d43648f1e6b12cf480ff6f0 (diff)
make dynamic track resizing "work" again; colinf's patch for operations on multiple selected regions from the region context menu
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3495 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
-rw-r--r--gtk2_ardour/time_axis_view.cc23
1 files changed, 6 insertions, 17 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8944fdc082..69a057bcf9 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -96,7 +96,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
last_name_entry_key_press_event = 0;
name_packing = NamePackingBits (0);
resize_drag_start = -1;
- resize_idle_id = -1;
/*
Create the standard LHS Controls
@@ -349,7 +348,7 @@ TimeAxisView::hide ()
void
TimeAxisView::step_height (bool bigger)
{
-static const int step = 20;
+ static const uint32_t step = 20;
if (bigger) {
set_height (height + step);
@@ -1201,18 +1200,10 @@ TimeAxisView::resizer_button_release (GdkEventButton* ev)
return true;
}
-static gboolean
-_idle_resizer (gpointer arg)
+void
+TimeAxisView::idle_resize (uint32_t h)
{
- return ((TimeAxisView*)arg)->idle_resize ();
-}
-
-bool
-TimeAxisView::idle_resize ()
-{
- set_height (resize_idle_target);
- resize_idle_id = -1;
- return false;
+ set_height (h);
}
bool
@@ -1233,10 +1224,8 @@ TimeAxisView::resizer_motion (GdkEventMotion* ev)
resize_idle_target = std::max (resize_idle_target - delta, (int) hSmall);
- if (resize_idle_id < 0) {
- // resize_idle_id = g_idle_add (_idle_resizer, this);
- }
-
+ editor.add_to_idle_resize (this, resize_idle_target);
+
resize_drag_start = ev->y_root;
return true;