diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-06-16 01:03:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-06-16 01:03:24 +0000 |
| commit | 1c90188ca8499260ac03630a9a42227b2389f6b3 (patch) | |
| tree | c95f07d0f03bf200576248f7255ae7e84fa07546 /gtk2_ardour/editor_summary.h | |
| parent | 2bc94116e85caf60f08ac020ec16858e42e2d332 (diff) | |
Cleaner implementation.
git-svn-id: svn://localhost/ardour2/branches/3.0@5198 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_summary.h')
| -rw-r--r-- | gtk2_ardour/editor_summary.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h index 79c4174262..817940796f 100644 --- a/gtk2_ardour/editor_summary.h +++ b/gtk2_ardour/editor_summary.h @@ -54,7 +54,8 @@ private: void render (cairo_t *); GdkPixmap* get_pixmap (GdkDrawable *); void render_region (RegionView*, cairo_t*, nframes_t, double) const; - void editor_view (std::pair<double, double> *, std::pair<double, double> *) const; + void get_editor (std::pair<double, double> *, std::pair<double, double> *) const; + void set_editor (std::pair<double, double> const &, std::pair<double, double> const &); Editor* _editor; ///< our editor ARDOUR::Session* _session; ///< our session @@ -65,20 +66,27 @@ private: double _x_scale; ///< pixels per frame for the x axis of the pixmap double _y_scale; + std::pair<double, double> _start_editor_x; + std::pair<double, double> _start_editor_y; + double _start_mouse_x; + double _start_mouse_y; + bool _move_dragging; double _x_offset; double _y_offset; bool _moved; bool _zoom_dragging; - double _mouse_x_start; - double _width_start; - double _zoom_start; - nframes64_t _frames_start; enum ZoomPosition { - LEFT, + TOP_LEFT, + TOP, + TOP_RIGHT, RIGHT, + BOTTOM_RIGHT, + BOTTOM, + BOTTOM_LEFT, + LEFT, NONE }; |