diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-19 15:27:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-19 15:27:04 +0000 |
| commit | f4f0dd6637878ba0597157ed8ec4550dcdb2a273 (patch) | |
| tree | c7ef51fb25cab5102e3f7b37503b68a3e38e1288 /gtk2_ardour/time_axis_view.h | |
| parent | c779251a3e0e9d3f6e7345251f245f1c3f057da2 (diff) | |
completely revisit how track name editing works in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@13898 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.h')
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index c366d26640..6e659e47a7 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -68,6 +68,7 @@ class Selectable; class RegionView; class GhostRegion; class StreamView; +class ArdourDialog; /** Abstract base class for time-axis views (horizontal editor 'strips') * @@ -116,9 +117,6 @@ class TimeAxisView : public virtual AxisView void idle_resize (uint32_t); - void show_name_label (); - void show_name_entry (); - virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent); virtual void hide (); @@ -204,7 +202,6 @@ class TimeAxisView : public virtual AxisView Gtk::VBox controls_vbox; Gtk::VBox time_axis_vbox; Gtk::HBox name_hbox; - Gtkmm2ext::FocusEntry* name_entry; Gtk::Label name_label; bool _name_editing; uint32_t height; /* in canvas units */ @@ -225,22 +222,17 @@ class TimeAxisView : public virtual AxisView virtual bool can_edit_name() const; - bool name_entry_button_press (GdkEventButton *ev); - bool name_entry_button_release (GdkEventButton *ev); bool name_entry_key_release (GdkEventKey *ev); - void name_entry_activated (); - sigc::connection name_entry_key_timeout; - bool name_entry_key_timed_out (); - guint32 last_name_entry_key_press_event; + bool name_entry_key_press (GdkEventKey *ev); - void begin_name_edit (GdkEvent*); - void end_name_edit (bool push_focus); + ArdourDialog* name_editor; + Gtk::Entry* name_entry; + void begin_name_edit (); + void end_name_edit (int); /* derived classes can override these */ virtual void name_entry_changed (); - virtual bool name_entry_focus_in (GdkEventFocus *ev); - virtual bool name_entry_focus_out (GdkEventFocus *ev); /** Handle mouse relaese on our LHS control name ebox. * |