X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.h;h=ba69b3b154c474b51fcd3fcb9619d6239a4d194c;hb=f9030dd2209b2794cf554f3d9423e6b0454286a6;hp=f8a30d57783bbc70a7863923d7468b58ae393fbc;hpb=3600f60a030de8bd5cca3fa983f3e926a084a1c0;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index f8a30d5778..ba69b3b154 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -74,7 +74,7 @@ class StreamView; * This class provides the basic LHS controls and display methods. This should be * extended to create functional time-axis based views. */ -class TimeAxisView : public virtual AxisView, public PBD::Stateful +class TimeAxisView : public virtual AxisView { private: enum NamePackingBits { @@ -87,9 +87,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas); virtual ~TimeAxisView (); - XMLNode& get_state (); - int set_state (const XMLNode&, int version); - static PBD::Signal1 CatchDeletion; /** @return index of this TimeAxisView within its parent */ @@ -98,6 +95,9 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful /** @return maximum allowable value of order */ static int max_order () { return _max_order; } + virtual void enter_internal_edit_mode () {} + virtual void leave_internal_edit_mode () {} + ArdourCanvas::Group* canvas_display () { return _canvas_display; } ArdourCanvas::Group* canvas_background () { return _canvas_background; } ArdourCanvas::Group* ghost_group () { return _ghost_group; } @@ -114,11 +114,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful uint32_t current_height() const { return height; } - bool resizer_button_press (GdkEventButton*); - bool resizer_button_release (GdkEventButton*); - bool resizer_motion (GdkEventMotion*); - bool resizer_expose (GdkEventExpose*); - void idle_resize (uint32_t); void hide_name_label (); @@ -126,20 +121,17 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful void show_name_label (); void show_name_entry (); - virtual bool set_visibility (bool); virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent); + virtual void hide (); void clip_to_viewport (); bool touched (double top, double bot); - /** Hide this TrackView */ - virtual void hide (); - /** @return true if hidden, otherwise false */ bool hidden () const { return _hidden; } - virtual void set_selected (bool); + void set_selected (bool); /** * potential handler for entered events @@ -149,18 +141,14 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful virtual void exited () {} virtual void set_height (uint32_t h); - void set_height (Height); + void set_height_enum (Height, bool apply_to_selection = false); void reset_height(); - std::pair covers_y_position (double); + virtual void reset_visual_state (); - /** - * Steps through the defined heights for this TrackView. - * Sets bigger to true to step up in size, set to fals eot step smaller. - * - * @param bigger true if stepping should increase in size, false otherwise - */ - virtual void step_height (bool bigger); + std::pair covers_y_position (double); + + virtual void step_height (bool); virtual ARDOUR::RouteGroup* route_group() const { return 0; } virtual boost::shared_ptr playlist() const { return boost::shared_ptr (); } @@ -169,12 +157,9 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful virtual void show_selection (TimeSelection&); virtual void hide_selection (); virtual void reshow_selection (TimeSelection&); - virtual void show_timestretch (nframes_t start, nframes_t end); + virtual void show_timestretch (framepos_t start, framepos_t end); virtual void hide_timestretch (); - virtual void hide_dependent_views (TimeAxisViewItem&) {} - virtual void reveal_dependent_views (TimeAxisViewItem&) {} - /* editing operations */ virtual void cut_copy_clear (Selection&, Editing::CutCopyOp) {} @@ -183,7 +168,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful virtual void set_selected_regionviews (RegionSelection&) {} virtual void set_selected_points (PointSelection&) {} - virtual boost::shared_ptr find_next_region (nframes_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) { + virtual boost::shared_ptr find_next_region (framepos_t /*pos*/, ARDOUR::RegionPoint, int32_t /*dir*/) { return boost::shared_ptr (); } @@ -202,11 +187,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful TimeAxisView* get_parent () { return parent; } void set_parent (TimeAxisView& p); - bool has_state () const; - - /* call this on the parent */ - - virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter /*param*/) { return 0; } virtual LayerDisplay layer_display () const { return Overlaid; } virtual StreamView* view () const { return 0; } @@ -215,20 +195,18 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful Children get_child_list (); SelectionRect* get_selection_rect(uint32_t id); - - static uint32_t preset_height (Height); + static uint32_t preset_height (Height); + protected: /* The Standard LHS Controls */ - Gtk::HBox controls_hbox; - Gtk::Table controls_table; - Gtk::EventBox controls_ebox; - Gtk::VBox controls_vbox; - Gtk::VBox time_axis_vbox; - Gtk::DrawingArea resizer; - Gtk::HBox resizer_box; - Gtk::HBox name_hbox; - Gtk::Frame name_frame; + Gtk::HBox controls_hbox; + Gtk::Table controls_table; + Gtk::EventBox controls_ebox; + Gtk::VBox controls_vbox; + Gtk::VBox time_axis_vbox; + Gtk::HBox name_hbox; + Gtk::Frame name_frame; Gtkmm2ext::FocusEntry name_entry; uint32_t height; /* in canvas units */ @@ -254,8 +232,11 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful * *@ param ev the event */ - virtual bool controls_ebox_button_release (GdkEventButton *ev); - virtual bool controls_ebox_scroll (GdkEventScroll *ev); + virtual bool controls_ebox_button_release (GdkEventButton*); + virtual bool controls_ebox_scroll (GdkEventScroll*); + virtual bool controls_ebox_button_press (GdkEventButton*); + virtual bool controls_ebox_motion (GdkEventMotion*); + virtual bool controls_ebox_leave (GdkEventCrossing*); /** Display the standard LHS control menu at when. * @@ -280,13 +261,10 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful TimeAxisView* parent; - /** Find the parent with state */ - TimeAxisView* get_parent_with_state(); - Children children; bool is_child (TimeAxisView*); - void remove_child (boost::shared_ptr); + virtual void remove_child (boost::shared_ptr); void add_child (boost::shared_ptr); /* selection display */ @@ -305,11 +283,13 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful bool in_destructor; NamePackingBits name_packing; - void set_heights (uint32_t h); void color_handler (); void conditionally_add_to_selection (); + void build_size_menu (); + Gtk::Menu* _size_menu; + ArdourCanvas::Group* _canvas_display; double _y_position; PublicEditor& _editor; @@ -321,13 +301,17 @@ private: int _order; uint32_t _effective_height; double _resize_drag_start; + GdkCursor* _preresize_cursor; + bool _have_preresize_cursor; ArdourCanvas::Group* _ghost_group; void compute_heights (); + static uint32_t button_height; static uint32_t extra_height; - static uint32_t smaller_height; static int const _max_order; + + bool maybe_set_cursor (int y); }; /* class TimeAxisView */