From b04ce87f79f50d702e8bb4083b22490f0019720e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 3 Jul 2013 02:31:05 +0200 Subject: refine meterbridge layout.. --- gtk2_ardour/meter_strip.cc | 10 +++++----- gtk2_ardour/meterbridge.cc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 7c468ec698..bbc09c0b48 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -144,10 +144,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr rt) peak_display.set_name ("MixerStripPeakDisplay"); max_peak = minus_infinity(); peak_display.unset_flags (Gtk::CAN_FOCUS); - peak_display.set_size_request(-1, 8); + peak_display.set_size_request(12, 8); Gtk::Alignment *peak_align = Gtk::manage (new Gtk::Alignment()); - peak_align->set(0.5, 1.0, 0.9, 0.8); + peak_align->set(0.5, 1.0, 0.0, 0.8); peak_align->add(peak_display); peakbx.pack_start(*peak_align, true, true); peakbx.set_size_request(-1, 14); @@ -467,8 +467,8 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector types) fraction = *j / 127.0; snprintf (buf, sizeof (buf), "%3d", *j); pos = height - (gint) rintf (height * fraction); - - cairo_arc(cr, 2, pos, 1.0, 0, 2 * M_PI); + cairo_set_line_width (cr, 1.0); + cairo_arc(cr, 2.5, pos, 1.0, 0, 2 * M_PI); cairo_fill(cr); cairo_stroke (cr); break; @@ -506,7 +506,7 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector types) } Gdk::Color c = w.get_style()->get_fg (Gtk::STATE_ACTIVE); cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); - cairo_move_to (cr, 1, height - th); + cairo_move_to (cr, 1, height - th - 1.5); pango_cairo_show_layout (cr, layout->gobj()); } diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 0441fc6cfd..0401b93896 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -127,7 +127,7 @@ Meterbridge::Meterbridge () Gdk::Geometry geom; geom.max_width = 1<<16; - geom.max_height = 1024; // XXX see FastMeter::max_pattern_metric_size + geom.max_height = 1024 + 52 + 16 + 12 ; // XXX see FastMeter::max_pattern_metric_size + meter-strip widgets set_geometry_hints(*((Gtk::Window*) this), geom, Gdk::HINT_MAX_SIZE); /* disable "maximize" button because it overrides size hint from above, -- cgit v1.2.3