From 76236cd796dfeeffca801dbd699a0baea47af516 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 27 Apr 2015 18:33:13 +0300 Subject: [PATCH] [Summary] Changed size of tooltips on Compact Meter Strips on Igor Maximenko's request. [Feature reviewed] MKosharnyy [Reviewed] VKamyshniy --- gtk2_ardour/compact_meter_bridge.cc | 1 - gtk2_ardour/compact_meter_strip.cc | 16 +++++++++++++--- gtk2_ardour/compact_meter_strip.h | 5 ++++- gtk2_ardour/ui/compact_meter_strip.xml | 8 ++++++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/compact_meter_bridge.cc b/gtk2_ardour/compact_meter_bridge.cc index aad96210e0..42e85d4981 100644 --- a/gtk2_ardour/compact_meter_bridge.cc +++ b/gtk2_ardour/compact_meter_bridge.cc @@ -176,7 +176,6 @@ CompactMeterbridge::add_strips (RouteList& routes) } CompactMeterStrip* strip = new CompactMeterStrip (_session, route); - strip->set_tooltip_text (route->name ()); //just for dbg purposes _strips [route] = strip; strip->show(); } diff --git a/gtk2_ardour/compact_meter_strip.cc b/gtk2_ardour/compact_meter_strip.cc index df04d48b6c..e1dfa07988 100644 --- a/gtk2_ardour/compact_meter_strip.cc +++ b/gtk2_ardour/compact_meter_strip.cc @@ -48,6 +48,7 @@ CompactMeterStrip::CompactMeterStrip (Session* sess, boost::shared_ptrroot (), "meterwidth", 1)) , _thin_meter_width (xml_property (*xml_tree ()->root (), "thinmeterwidth", 1)) + , _tooltip (this) { set_attributes (*this, *xml_tree ()->root (), XMLNodeMap ()); @@ -86,6 +87,17 @@ CompactMeterStrip::CompactMeterStrip (Session* sess, boost::shared_ptrroot (), "tooltip_winfont", "Arial Bold 20"); +#elif defined (__APPLE__) + str_font_description = xml_property (*xml_tree ()->root (), "tooltip_macfont", "Helvetica Bold 20"); +#endif + + _tooltip.set_font (Pango::FontDescription(str_font_description)); + _tooltip.set_center_alignment (false); } bool @@ -130,9 +142,7 @@ void CompactMeterStrip::update_tooltip () { string record_status = _route->record_enabled() ? "Record Enabled" : "Record Disabled"; - - stringstream ss; - this->set_tooltip_text (string_compose ("Track %1\n%2\n%3", _serial_number, _route->name (), record_status)); + _tooltip.set_tip (string_compose ("%1\n%2\n%3", _serial_number, _route->name (), record_status)); } void diff --git a/gtk2_ardour/compact_meter_strip.h b/gtk2_ardour/compact_meter_strip.h index 68489c0528..ba4ef6a47d 100644 --- a/gtk2_ardour/compact_meter_strip.h +++ b/gtk2_ardour/compact_meter_strip.h @@ -20,6 +20,7 @@ #define __tracks_compact_meter_strip__ #include "waves_ui.h" +#include "gtkmm2ext/persistent_tooltip.h" #include "level_meter.h" #include "ardour/ardour.h" @@ -37,6 +38,7 @@ class CompactMeterStrip : public Gtk::EventBox, public WavesUI size_t get_serial_number () { return _serial_number; } void set_serial_number ( size_t serial_number ) { _serial_number = serial_number; } void update_tooltip (); + void set_persistant_tooltip_font (Pango::FontDescription font); void fast_update (); boost::shared_ptr route() { return _route; } @@ -54,7 +56,8 @@ class CompactMeterStrip : public Gtk::EventBox, public WavesUI PBD::ScopedConnectionList _route_connections; int _meter_width; int _thin_meter_width; - size_t _serial_number; + size_t _serial_number; + Gtkmm2ext::PersistentTooltip _tooltip; void meter_configuration_changed (ARDOUR::ChanCount); void update_rec_display (); void route_property_changed(const PBD::PropertyChange& what_changed); diff --git a/gtk2_ardour/ui/compact_meter_strip.xml b/gtk2_ardour/ui/compact_meter_strip.xml index 00e132fdaa..6ba9292e7b 100644 --- a/gtk2_ardour/ui/compact_meter_strip.xml +++ b/gtk2_ardour/ui/compact_meter_strip.xml @@ -2,12 +2,16 @@ - + thinmeterwidth="4" + tooltip_winfont="Arial Bold 20" + tooltip_macfont="Helvetica Bold 20"> + +