Fix various tooltip markup (ampersand) entity-escape:

[ardour.git] / gtk2_ardour / midi_scroomer.cc

diff --git a/gtk2_ardour/midi_scroomer.cc b/gtk2_ardour/midi_scroomer.cc
index c3295c8f7344e7784a6610edfc4921b26ae81d11..6fad2cc1f1ce32aef2a14e6a359267ba335c7f33 100644 (file)
--- a/gtk2_ardour/midi_scroomer.cc
+++ b/gtk2_ardour/midi_scroomer.cc
@@ -16,20 +16,19 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "midi_scroomer.h"
-
+#include <iostream>
 #include <cairomm/context.h>
 
-#include <iostream>
+#include "midi_scroomer.h"
+#include "ui_config.h"
 
-using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace std;
 
 //std::map<int, Glib::RefPtr<Gdk::Pixmap> > MidiScroomer::piano_pixmaps;
 
 MidiScroomer::MidiScroomer(Adjustment& adj)
-       : Gtkmm2ext::Scroomer(adj)
+       : ArdourWidgets::Scroomer(adj)
 {
 
        adj.set_lower(0);
@@ -164,5 +163,5 @@ MidiScroomer::get_colors(double color[], Component comp)
 void
 MidiScroomer::on_size_request(Gtk::Requisition* r)
 {
-       r->width = 12;
+       r->width = std::max (12.f, rintf (12.f * UIConfiguration::instance().get_ui_scale()));
 }