Soundship/Loopp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

-Updated UI, working on graphics

Browse source
This commit is contained in:
Harry van Haaren 2013-07-21 15:47:35 +01:00
parent 95c2178a3a
commit 37059756a1
4 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/avtk/avtk_background.h
View file

@ -63,10 +63,10 @@ class Background : public Fl_Widget
// fill background
cairo_rectangle( cr, x, y, w, h);
cairo_set_source_rgba( cr, 66 / 255.f, 66 / 255.f , 66 / 255.f , 1 );
cairo_set_source_rgba( cr, 28 / 255.f, 28 / 255.f , 28 / 255.f , 1 );
cairo_fill( cr );
/*
// set up dashed lines, 1 px off, 1 px on
double dashes[1];
dashes[0] = 2.0;
@ -84,7 +84,7 @@ class Background : public Fl_Widget
cairo_set_source_rgba( cr, 28 / 255.f, 28 / 255.f , 28 / 255.f , 0.5 );
cairo_stroke(cr);
cairo_set_dash ( cr, dashes, 0, 0.0);
*/
// draw header
// backing
@ -106,7 +106,7 @@ class Background : public Fl_Widget
// stroke rim
cairo_rectangle(cr, x, y, w, h);
cairo_set_source_rgba( cr, 0 / 255.f, 153 / 255.f , 255 / 255.f , 1 );
cairo_set_source_rgba( cr, 66 / 255.f, 66 / 255.f , 66 / 255.f , 1 );
cairo_stroke( cr );

6
src/avtk/avtk_button.h
View file

@ -62,7 +62,7 @@ class Button : public Fl_Button
cairo_set_source_rgb( cr,28 / 255.f, 28 / 255.f , 28 / 255.f );
cairo_fill_preserve(cr);
cairo_set_line_width(cr, 1.5);
cairo_set_line_width(cr, 1.3);
cairo_rectangle( cr, x+1, y+1, w-2, h-2 );
if ( highlight )
@ -71,10 +71,12 @@ class Button : public Fl_Button
cairo_fill_preserve(cr);
}
float alpha = 0.7;
float alpha = 0.6;
if (mouseOver)
alpha = 1;
cairo_set_source_rgba(cr, 1.0, 0.48, 0, alpha);
if ( highlight )
cairo_set_line_width(cr, 2.2);
cairo_stroke(cr);
cairo_restore( cr );

39
src/gtrack.hxx
View file

@ -100,21 +100,21 @@ class GTrack : public Fl_Group
title( strdup(l) ),
bg( x, y , w, h, title ),
button1(x + 5, y + 24, 100, 18,"Rec"),
button2(x + 5, y + 44, 100, 18,"Play"),
button3(x + 5, y + 64, 100, 18,"Stop"),
button4(x + 5, y + 84, 48, 18,"-"),
button5(x +57, y + 84, 48, 18,"+"),
button1(x + 5, y + 324, 100, 18,"Rec"),
button2(x + 5, y + 344, 100, 18,"Play"),
button3(x + 5, y + 364, 100, 18,"Stop"),
button4(x + 5, y + 384, 48, 18,"-"),
button5(x +57, y + 384, 48, 18,"+"),
button6(x + 5, y +104, 100, 18,"Load"),
button6(x + 5, y + 404, 100, 18,"Load"),
volume(x+55-22, y +175, 34, 34, "Vol"),
volume(x+55-22, y +490, 34, 34, "Vol"),
dial1(x+15, y +135, 24, 24, "A"),
dial2(x+45, y +135, 24, 24, "B"),
dial3(x+75, y +135, 24, 24, "C"),
dial1(x+15, y +455, 24, 24, "A"),
dial2(x+45, y +455, 24, 24, "B"),
dial3(x+75, y +455, 24, 24, "C"),
progress(x+5, y+3, 100, 15, "prog")
progress(x+5, y+428, 100, 18, "")
{
ID = privateID++;
@ -129,6 +129,23 @@ class GTrack : public Fl_Group
progress.maximum(1.0f);
progress.minimum(0.0f);
progress.color( fl_color_cube(0.2 * (FL_NUM_RED - 1) / 255,
0.2 * (FL_NUM_GREEN - 1) / 255,
0.2 * (FL_NUM_BLUE - 1) / 255) );
progress.selection_color( FL_BLUE );
/*
00366 Fl_Color color() const {return color_;}
00367
00378 void color(Fl_Color bg) {color_ = bg;}
00379
00384 Fl_Color selection_color() const {return color2_;}
00385
00394 void selection_color(Fl_Color a) {color2_ = a;}
00395
00403 void color(Fl_Color bg, Fl_Color sel) {color_=bg; color2_=sel;}
00404
*/
end(); // close the group
}

10
src/gui.cxx
View file

@ -28,23 +28,25 @@ static void gui_static_read_rb(void* inst)
}
Gui::Gui() :
window(1200,280)
window(1200,750)
{
window.color(FL_BLACK);
window.label("Luppp 5");
//window.callback( close_cb, 0 );
Avtk::Image* header = new Avtk::Image(0,0,600,36,"header.png");
Avtk::Image* header = new Avtk::Image(0,0,1200,36,"header.png");
int i = 0;
for (; i < NTRACKS; i++ )
{
stringstream s;
s << "Track " << i+1;
tracks.push_back( new GTrack(8 + i * 118, 40, 110, 230, s.str().c_str() ) );
tracks.push_back( new GTrack(8 + i * 118, 40, 110, 650, s.str().c_str() ) );
}
master = new GMasterTrack(9 + i * 118, 40, 150, 230, "Master");
master = new GMasterTrack(9 + i * 118, 40, 150, 250, "Master");
/*
box = new Fl_Box(655, 5, 200, 60, "BPM = 120");