ardour/livetrax
13
0
Fork 0
Code

refine meterbridge layout..

Browse Source
This commit is contained in:
Robin Gareus 2013-07-03 02:31:05 +02:00
parent 95736d6652
commit b04ce87f79
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/meter_strip.cc
View File

@ -144,10 +144,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> 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<DataType> 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<DataType> 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());
}

2
gtk2_ardour/meterbridge.cc
View File

@ -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,