smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-23 13:47:24 +01:00
Code Issues Projects Releases Wiki Activity

More consistent style for gain display and peak display.

Browse source 
Gain display is still a little bit smaller though, for mysterious reasons...


git-svn-id: svn://localhost/ardour2/branches/3.0@9556 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-05-18 07:05:30 +00:00
parent a54f10d861
commit 659f7c5ef3
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour3_ui_dark.rc.in
View file

@ -1730,6 +1730,7 @@ widget "*MixerStripGainUnitButton" style:highest "very_small_button"
widget "*MixerStripGainUnitButton*" style:highest "very_small_button"
widget "*MixerStripMeterPreButton" style:highest "very_small_button"
widget "*MixerStripMeterPreButton*" style:highest "very_small_button"
widget "*MixerStripPeakDisplay" style:highest "red_active_small_entry"
widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"

9
gtk2_ardour/gain_meter.cc
View file

@ -115,16 +115,13 @@ GainMeterBase::GainMeterBase (Session* s,
gain_slider->set_name ("GainFader");
gain_display.set_name ("MixerStripGainDisplay");
gain_display.set_has_frame (false);
set_size_request_to_display_given_text (gain_display, "-80.g", 2, 6); /* note the descender */
gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated));
gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
peak_display.set_name ("MixerStripPeakDisplay");
// peak_display.set_has_frame (false);
// peak_display.set_editable (false);
set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
max_peak = minus_infinity();
peak_display.set_label (_("-inf"));
peak_display.unset_flags (Gtk::CAN_FOCUS);
@ -320,7 +317,7 @@ GainMeterBase::reset_group_peak_display (RouteGroup* group)
{
if (_route && group == _route->route_group()) {
reset_peak_display ();
}
}
}
void
@ -803,7 +800,7 @@ GainMeterBase::on_theme_changed()
GainMeter::GainMeter (Session* s, int fader_length)
: GainMeterBase (s, slider, false, fader_length)
, gain_display_box(true, 2)
, gain_display_box(true, 0)
, hbox(true, 2)
{
gain_display_box.pack_start (gain_display, true, true);