mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-29 09:57:44 +01:00
revert to right-side mixer metric-labels
This commit is contained in:
parent
3475ea4b22
commit
55c5a76e8b
2 changed files with 11 additions and 10 deletions
|
|
@ -233,6 +233,10 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
|
|||
tickright = w.get_name().substr(w.get_name().length() - 5) == "Right";
|
||||
background = types.size() == 0 || tickleft || tickright;
|
||||
|
||||
if (!tickleft && !tickright) {
|
||||
tickright = true;
|
||||
}
|
||||
|
||||
cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height);
|
||||
cairo_t* cr = cairo_create (surface);
|
||||
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(w.get_pango_context());
|
||||
|
|
@ -296,11 +300,6 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
|
|||
} else {
|
||||
c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
|
||||
cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
|
||||
|
||||
if (!tickleft && !tickright && (*i) == DataType::AUDIO) {
|
||||
tickleft = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
std::map<int,float> points;
|
||||
|
|
@ -384,7 +383,6 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
|
|||
snprintf (buf, sizeof (buf), "%3d", j->first);
|
||||
pos = 1 + height - (gint) rintf (height * fraction);
|
||||
pos = min (pos, height);
|
||||
#if 0
|
||||
if (tickleft) {
|
||||
cairo_arc(cr, width - 2.0, pos + .5, 1.0, 0, 2 * M_PI);
|
||||
cairo_fill(cr);
|
||||
|
|
@ -392,7 +390,6 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
|
|||
cairo_arc(cr, 3, pos + .5, 1.0, 0, 2 * M_PI);
|
||||
cairo_fill(cr);
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -403,7 +400,7 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types)
|
|||
int tw, th;
|
||||
layout->get_pixel_size(tw, th);
|
||||
|
||||
int p = pos - (th / 2);
|
||||
int p = pos - (th / 2) - 1;
|
||||
p = min (p, height - th);
|
||||
p = max (p, 0);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue