ardour/livetrax
13
0
Fork 0
Code

fix drawing of lollipops.

Browse Source 
There may be more virtual GhostRegion methods that VelocityGhostRegion has to proxy
to VelocityDisplay
This commit is contained in:
Paul Davis 2024-09-16 22:57:17 -06:00
parent 54fdf90cc2
commit a44e8ac088
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ghostregion.cc
View File

@ -428,4 +428,3 @@ MidiGhostRegion::model_changed ()
++i;
}
}

8
gtk2_ardour/velocity_display.cc
View File

@ -68,7 +68,6 @@ VelocityDisplay::VelocityDisplay (EditingContext& ec, MidiViewBackground& backgr
, selected (false)
, _optimization_iterator (events.end())
{
std::cerr << "new VD @ " << this << " view " << &view << std::endl;
base.set_data (X_("ghostregionview"), this);
base.Event.connect (sigc::mem_fun (*this, &VelocityDisplay::base_event));
base.set_fill_color (UIConfiguration::instance().color_mod ("ghost track base", "ghost track midi fill"));
@ -159,7 +158,6 @@ VelocityDisplay::clear ()
void
VelocityDisplay::add_note (NoteBase* nb)
{
std::cerr << "Add new lolli\n";
ArdourCanvas::Lollipop* l = new ArdourCanvas::Lollipop (lolli_container);
l->set_bounding_parent (&base);
@ -189,15 +187,15 @@ VelocityDisplay::set_size_and_position (GhostEvent& gev)
}
ArdourCanvas::Lollipop* l = dynamic_cast<ArdourCanvas::Lollipop*> (gev.item);
const double available_height = base.y1();
const double available_height = base.height();
const double actual_height = ((dragging ? gev.velocity_while_editing : gev.event->note()->velocity()) / 127.0) * available_height;
const double scale = UIConfiguration::instance ().get_ui_scale ();
if (gev.is_hit) {
/* compare to Hit::points , offset by w/2 */
l->set (ArdourCanvas::Duple (gev.event->x0() + (gev.event->x1() - gev.event->x0()) / 2, base.height() - actual_height), actual_height, lollipop_radius * scale);
l->set (ArdourCanvas::Duple (gev.event->x0() + (gev.event->x1() - gev.event->x0()) / 2, base.y1() - actual_height), actual_height, lollipop_radius * scale);
} else {
l->set (ArdourCanvas::Duple (gev.event->x0(), base.height() - actual_height), actual_height, lollipop_radius * scale);
l->set (ArdourCanvas::Duple (gev.event->x0(), base.y1() - actual_height), actual_height, lollipop_radius * scale);
}
}

2
gtk2_ardour/velocity_display.h
View File

@ -73,7 +73,7 @@ class VelocityDisplay
ArdourCanvas::Rectangle& base_item() { return base; }
MidiView& midi_view() const { return view; }
protected:
virtual bool lollevent (GdkEvent*, GhostEvent*) = 0;

6
gtk2_ardour/velocity_ghost_region.cc
View File

@ -111,3 +111,9 @@ VelocityGhostRegion::note_selected (NoteBase* nb)
{
VelocityDisplay::note_selected (nb);
}
void
VelocityGhostRegion::update_contents_height ()
{
VelocityDisplay::redisplay ();
}

2
gtk2_ardour/velocity_ghost_region.h
View File

@ -42,6 +42,8 @@ class VelocityGhostRegion : public MidiGhostRegion, public VelocityDisplay
void add_note (NoteBase*);
void note_selected (NoteBase*);
void update_note (GhostEvent*);
void update_contents_height ();
ArdourCanvas::Rectangle& base_item();
void set_colors ();