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

-Updated Avtk graphics

main
Harry van Haaren 2013-07-31 02:27:04 +01:00
parent 08a0d28f29
commit cf359f044d
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/avtk/avtk_background.h
View File

@ -34,7 +34,7 @@ namespace Avtk
class Background : public Fl_Widget
{
public:
Background(int _x, int _y, int _w, int _h, const char *_label):
Background(int _x, int _y, int _w, int _h, const char *_label = 0):
Fl_Widget(_x, _y, _w, _h, _label)
{
x = _x;

10
src/avtk/avtk_clip_selector.h
View File

@ -189,11 +189,11 @@ class ClipSelector : public Fl_Button
int drawY = y + 1;
for( int i = 0; i < numClips; i++) // draw each clip
{
cairo_rectangle( cr, x+1, drawY, clipWidth, clipHeight - 4 );
cairo_rectangle( cr, x+2, drawY, clipWidth-1, clipHeight - 4 );
cairo_set_source_rgba(cr, 66 / 255.f, 66 / 255.f , 66 / 255.f, 0.4);
cairo_fill(cr);
cairo_rectangle( cr, x+1, drawY, clipHeight - 2, clipHeight - 4 );
cairo_rectangle( cr, x+2, drawY, clipHeight-4, clipHeight - 4 );
if ( clips[i].recording() )
{
@ -251,11 +251,11 @@ class ClipSelector : public Fl_Button
cairo_fill(cr);
}
cairo_rectangle( cr, x+1, drawY, clipWidth, clipHeight - 2 );
cairo_rectangle( cr, x+2, drawY, clipWidth -1, clipHeight - 3 );
float alpha = 1.0;
float alpha = 1;
cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, alpha);
cairo_set_line_width( cr, 1.4);
cairo_set_line_width( cr, 1.3);
cairo_move_to( cr, x+clipHeight-1, drawY );
cairo_line_to( cr, x+clipHeight-1, drawY + clipHeight - 2);
cairo_stroke(cr);

13
src/avtk/avtk_radial_status.h
View File

@ -104,15 +104,12 @@ class RadialStatus : public Fl_Slider
cairo_set_line_cap ( cr, CAIRO_LINE_CAP_ROUND );
//cairo_move_to( cr, x + xc, y + yc );
cairo_arc( cr, x + xc, y + yc, xc - 10, -(3.1415/2), angle * 6.28 - (3.1415/2) );
/*
cairo_set_source_rgba( cr, 0 / 255.f, 153 / 255.f , 255 / 255.f , 0.21 );
cairo_set_line_width(cr, 1.0);
cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8 );
cairo_set_line_width(cr, 13.2);
cairo_stroke_preserve(cr);
//cairo_fill_preserve(cr);
*/
cairo_set_source_rgba (cr, 1.0, 0.48, 0.0, 0.8 );
//cairo_set_source_rgba( cr, 0 / 255.f, 153 / 255.f , 255 / 255.f , 0.8 );
cairo_set_line_width(cr, 6.2);
cairo_set_source_rgba (cr, 1.0, 0.48, 0.0, 1 );
cairo_set_line_width(cr, 8.2);
cairo_stroke(cr);
}

4
src/avtk/avtk_volume.h
View File

@ -102,7 +102,7 @@ class Volume : public Fl_Slider
double dashes[1];
dashes[0] = 2.0;
cairo_set_dash ( cr, dashes, 1, 0.0);
//cairo_set_dash ( cr, dashes, 1, 0.0);
cairo_set_line_width( cr, 1.0);
// loop over each 2nd line, drawing dots
@ -121,7 +121,7 @@ class Volume : public Fl_Slider
cairo_set_source_rgba( cr, 66 / 255.f, 66 / 255.f , 66 / 255.f , 0.5 );
cairo_stroke(cr);
cairo_set_dash ( cr, dashes, 0, 0.0);
//cairo_set_dash ( cr, dashes, 0, 0.0);
// audio level