diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-15 13:50:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-15 13:50:05 -0400 |
commit | 7e19053b88b4ab174052a44f2ee99dce92517aa9 (patch) | |
tree | d996b22ac8661421cc661d336322923deda00f73 /gtk2_ardour/streamview.h | |
parent | af4539f857a14be3856da89a20811bf39e4ffb6e (diff) |
Fix dragging objects on the canvas and remove redundant canvas groups
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).
Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
Diffstat (limited to 'gtk2_ardour/streamview.h')
-rw-r--r-- | gtk2_ardour/streamview.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 869772ed20..ce7991d2eb 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -83,7 +83,6 @@ public: void set_layer_display (LayerDisplay); LayerDisplay layer_display () const { return _layer_display; } - ArdourCanvas::Group* background_group() { return _background_group; } ArdourCanvas::Group* canvas_item() { return _canvas_group; } enum ColorTarget { @@ -129,7 +128,7 @@ public: sigc::signal<void> ContentsHeightChanged; protected: - StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0); + StreamView (RouteTimeAxisView&); void transport_changed(); void transport_looped(); @@ -152,11 +151,8 @@ protected: virtual void color_handler () = 0; RouteTimeAxisView& _trackview; - bool owns_background_group; - bool owns_canvas_group; - ArdourCanvas::Group* _background_group; ArdourCanvas::Group* _canvas_group; - ArdourCanvas::Rectangle* canvas_rect; /* frame around the whole thing */ + ArdourCanvas::Rectangle* canvas_rect; /* frame around the whole thing */ typedef std::list<RegionView* > RegionViewList; RegionViewList region_views; |