From 47eebaa396e190075d48393a262e8514d6ad81fb Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Sun, 21 Jul 2013 16:08:15 +0100 Subject: [PATCH] -Updated Clip selector --- src/avtk/avtk_clip_selector.h | 4 ++-- src/gtrack.hxx | 2 +- src/gui.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/avtk/avtk_clip_selector.h b/src/avtk/avtk_clip_selector.h index 6bdf3ab..07ea31f 100644 --- a/src/avtk/avtk_clip_selector.h +++ b/src/avtk/avtk_clip_selector.h @@ -82,7 +82,7 @@ class ClipSelector : public Fl_Button else if ( false ) // loaded: orange cairo_set_source_rgba(cr, 1.0, 0.48, 0, 0.4); else // empty: grey - cairo_set_source_rgba(cr, 0.11, 0.11, 0.11, 0.8); + cairo_set_source_rgba(cr, 66 / 255.f, 66 / 255.f , 66 / 255.f, 0.4); cairo_fill_preserve(cr); @@ -95,7 +95,7 @@ class ClipSelector : public Fl_Button float alpha = 0.7; if (mouseOver) { alpha = 1; } - cairo_set_source_rgba(cr, 1.0, 0.48, 0, alpha); + cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, alpha); cairo_set_line_width( cr, 1.4); cairo_stroke(cr); diff --git a/src/gtrack.hxx b/src/gtrack.hxx index 6852cbc..849206e 100644 --- a/src/gtrack.hxx +++ b/src/gtrack.hxx @@ -101,7 +101,7 @@ class GTrack : public Fl_Group title( strdup(l) ), bg( x, y , w, h, title ), - clipSel(x + 5, y + 26, 100, 278,"Clips"), + clipSel(x + 5, y + 26, 100, 279,"Clips"), button1(x + 5, y + 324, 100, 18,"Rec"), button2(x + 5, y + 344, 100, 18,"Play"), diff --git a/src/gui.cxx b/src/gui.cxx index a86e870..cb4b1d3 100644 --- a/src/gui.cxx +++ b/src/gui.cxx @@ -45,7 +45,7 @@ Gui::Gui() : tracks.push_back( new GTrack(8 + i * 118, 40, 110, 650, s.str().c_str() ) ); } - master = new GMasterTrack(9 + i * 118, 40, 150, 250, "Master"); + master = new GMasterTrack(9 + i * 118, 40, 150, 650, "Master"); /*