diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-17 22:26:51 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-17 22:26:51 +0200 |
| commit | 67369333851511364cb9048de39aaad3282ce697 (patch) | |
| tree | 6a84a019b739ec6f2c56c0fb75340364c89fda56 /gtk2_ardour/meter_patterns.cc | |
| parent | 406070584df05cbc8877fcb005313c2e1ad25f02 (diff) | |
move mixer-metric pattern to the left
Diffstat (limited to 'gtk2_ardour/meter_patterns.cc')
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index 7818711922..2704e4555d 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -224,13 +224,14 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types) { Glib::RefPtr<Gdk::Window> win (w.get_window()); - bool tickleft; + bool tickleft, tickright; bool background; gint width, height; win->get_size (width, height); tickleft = w.get_name().substr(w.get_name().length() - 4) == "Left"; - background = types.size() == 0 || tickleft || w.get_name().substr(w.get_name().length() - 5) == "Right"; + tickright = w.get_name().substr(w.get_name().length() - 5) == "Right"; + background = types.size() == 0 || tickleft || tickright; cairo_surface_t* surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height); cairo_t* cr = cairo_create (surface); @@ -296,6 +297,11 @@ 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; @@ -366,11 +372,12 @@ meter_render_metrics (Gtk::Widget& w, vector<DataType> types) if (tickleft) { cairo_move_to(cr, width-1.5, pos + .5); cairo_line_to(cr, width, pos + .5); - } else { + cairo_stroke (cr); + } else if (tickright) { cairo_move_to(cr, 0, pos + .5); cairo_line_to(cr, 1.5, pos + .5); + cairo_stroke (cr); } - cairo_stroke (cr); break; case DataType::MIDI: cairo_set_line_width (cr, 1.0); @@ -378,12 +385,15 @@ 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); - } else { + cairo_fill(cr); + } else if (tickright) { cairo_arc(cr, 3, pos + .5, 1.0, 0, 2 * M_PI); + cairo_fill(cr); } - cairo_fill(cr); +#endif break; } |