Move cpu and disk gauges into the status bar at top.

[ardour.git] / gtk2_ardour / ardour_gauge.cc

diff --git a/gtk2_ardour/ardour_gauge.cc b/gtk2_ardour/ardour_gauge.cc
index 809ed7856dab761c7195c6fe883076e9e52d12e5..80249ac3c8f656a06c18e20fddc7a3c37b21cf9c 100644 (file)
--- a/gtk2_ardour/ardour_gauge.cc
+++ b/gtk2_ardour/ardour_gauge.cc
@@ -43,8 +43,8 @@ ArdourGauge::on_size_request (Gtk::Requisition* req)
        int w, h;
        _layout->get_pixel_size (w, h);
 
-       req->width = std::max (req->width, std::max (12, h + PADDING));
-       req->height = std::max (req->height, 20 /*std::max (20, w + PADDING) */);
+       req->width = std::max (req->width, 50 /*std::max (20, w + PADDING) */);
+       req->height = std::max (req->height, std::max (12, h + PADDING));
 }
 
 void
@@ -72,29 +72,34 @@ void
 ArdourGauge::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
 {
        cairo_t* cr = ctx->cobj ();
+       Gtkmm2ext::Color bg = UIConfiguration::instance().color ("gtk_background");
        Gtkmm2ext::Color base = UIConfiguration::instance ().color ("ruler base");
        Gtkmm2ext::Color text = UIConfiguration::instance ().color ("ruler text");
 
        const int width = get_width ();
        const int height = get_height ();
 
-       Gtkmm2ext::rounded_rectangle (cr, 0, 0, width, height, PADDING + 1);
-       Gtkmm2ext::set_source_rgba (cr, base);
+       cairo_rectangle (cr, 0, 0, width, height);
+       cairo_set_source_rgba (cr, 0,0,0,1 );
+       cairo_fill (cr);
+
+       cairo_rectangle (cr, 1, 1, width-2, height-2);
+       Gtkmm2ext::set_source_rgba (cr, bg);
        cairo_fill (cr);
 
        if (alert () && _blink) {
-               Gtkmm2ext::rounded_rectangle (cr, 1, 1, width - 2, height - 2, PADDING + 1);
+               Gtkmm2ext::rounded_rectangle (cr, 1, 1, width - 2, height - 2, 1);
                cairo_set_source_rgba (cr, 0.5, 0, 0, 1.0);
                cairo_fill (cr);
        }
 
-       Gtkmm2ext::rounded_rectangle (cr, PADDING, PADDING, width - PADDING - PADDING, height - PADDING - PADDING, PADDING + 1);
+       cairo_rectangle (cr, PADDING, PADDING, width - PADDING - PADDING, height - PADDING - PADDING);
        cairo_clip (cr);
 
        const float lvl = level ();
 
-       int bh = (height - PADDING - PADDING) * lvl;
-       cairo_rectangle (cr, PADDING, height - PADDING - bh, width - PADDING, bh);
+       int bw = (width - PADDING - PADDING) * lvl;
+       cairo_rectangle (cr, width-PADDING-bw, PADDING, bw, height-PADDING);
 
        switch (indicator ()) {
                case Level_OK:
@@ -115,7 +120,6 @@ ArdourGauge::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t
        cairo_save (cr);
        cairo_new_path (cr);
        cairo_translate (cr, width * .5, height * .5);
-       cairo_rotate (cr, M_PI * -.5);
 
        cairo_move_to (cr, w * -.5, h * -.5);
        pango_cairo_update_layout (cr, _layout->gobj());