From 2884ac6346e6a85e04e24e71b11bfc9a0e075f7e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 3 Mar 2013 11:36:47 +0000 Subject: [PATCH] clock info-box: fix alignment and spacing git-svn-id: svn://localhost/ardour2/branches/3.0@14123 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/audio_clock.cc | 14 +++++++------- libs/ardour/ardour/slave.h | 2 +- libs/ardour/ltc_slave.cc | 2 +- libs/ardour/midi_clock_slave.cc | 2 +- libs/ardour/mtc_slave.cc | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index b70523b62f..7596142a7a 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -53,13 +53,13 @@ using Gtkmm2ext::Keyboard; sigc::signal AudioClock::ModeChanged; vector AudioClock::clocks; -const double AudioClock::info_font_scale_factor = 0.5; +const double AudioClock::info_font_scale_factor = 0.50; const double AudioClock::separator_height = 0.0; const double AudioClock::x_leading_padding = 6.0; #define BBT_BAR_CHAR "|" #define BBT_SCANF_FORMAT "%" PRIu32 "%*c%" PRIu32 "%*c%" PRIu32 -#define INFO_FONT_SIZE ((int)round(font_size * info_font_scale_factor)) +#define INFO_FONT_SIZE ((int)lrint(font_size * info_font_scale_factor)) AudioClock::AudioClock (const string& clock_name, bool transient, const string& widget_name, bool allow_edit, bool follows_playhead, bool duration, bool with_info) @@ -178,7 +178,7 @@ AudioClock::set_font () /* now a smaller version of the same font */ delete font_attr; - font.set_size ((int) lrint (font_size * info_font_scale_factor)); + font.set_size (INFO_FONT_SIZE); font.set_weight (Pango::WEIGHT_NORMAL); font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); @@ -493,7 +493,7 @@ AudioClock::on_size_request (Gtk::Requisition* req) tmp->set_font_description (font); - font.set_size ((int) lrint (font.get_size() * info_font_scale_factor)); + font.set_size (INFO_FONT_SIZE); font.set_weight (Pango::WEIGHT_NORMAL); tmp->set_font_description (font); @@ -2104,7 +2104,7 @@ AudioClock::set_mode (Mode m) switch (_mode) { case Timecode: - mode_based_info_ratio = 0.5; + mode_based_info_ratio = 0.6; insert_map.push_back (11); insert_map.push_back (10); insert_map.push_back (8); @@ -2129,7 +2129,7 @@ AudioClock::set_mode (Mode m) break; case MinSec: - mode_based_info_ratio = 0.5; + mode_based_info_ratio = 0.6; insert_map.push_back (12); insert_map.push_back (11); insert_map.push_back (10); @@ -2142,7 +2142,7 @@ AudioClock::set_mode (Mode m) break; case Frames: - mode_based_info_ratio = 0.5; + mode_based_info_ratio = 0.45; break; } diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 508664e31b..9862824da9 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -38,7 +38,7 @@ /* used for approximate_current_delta(): */ #define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") ) -#define LEADINGZERO(A) ( (A)<10 ? " " : (A)<100 ? " " : (A)<1000 ? " " : (A)<10000 ? " " : "" ) +#define LEADINGZERO(A) ( (A)<10 ? " " : (A)<100 ? " " : (A)<1000 ? " " : "" ) namespace MIDI { class Port; diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index 1800b57e11..8d08fd6bb5 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -590,7 +590,7 @@ LTC_Slave::approximate_current_delta() const } else if ((monotonic_cnt - last_timestamp) > 2 * frames_per_ltc_frame) { snprintf(delta, sizeof(delta), _("flywheel")); } else { - snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 "sm", LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index ef2d22ab18..53dd186384 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -363,7 +363,7 @@ MIDIClock_Slave::approximate_current_delta() const if (last_timestamp == 0 || _starting) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 "sm", LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 3f678eed5e..8ce0722d8b 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -705,7 +705,7 @@ MTC_Slave::approximate_current_delta() const if (last.timestamp == 0 || reset_pending) { snprintf(delta, sizeof(delta), "\u2012\u2012\u2012\u2012"); } else { - snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 " sm", + snprintf(delta, sizeof(delta), "\u0394%s%s%" PRIi64 "sm", LEADINGZERO(abs(current_delta)), PLUSMINUS(-current_delta), abs(current_delta)); } return std::string(delta); -- 2.30.2