Browse Source

Timeline: Tweak measure line drawing.

tags/non-daw-v1.2.0
Jonathan Moore Liles 13 years ago
parent
commit
7217266f6b
2 changed files with 6 additions and 6 deletions
  1. +2
    -3
      timeline/src/Sequence.C
  2. +4
    -3
      timeline/src/Track.C

+ 2
- 3
timeline/src/Sequence.C View File

@@ -63,8 +63,7 @@ Sequence::init ( void )


_name = NULL; _name = NULL;


// box( FL_DOWN_BOX );
box( FL_BORDER_BOX );
box( FL_FLAT_BOX );
color( FL_BACKGROUND_COLOR ); color( FL_BACKGROUND_COLOR );
align( FL_ALIGN_LEFT ); align( FL_ALIGN_LEFT );


@@ -281,7 +280,7 @@ Sequence::draw ( void )


// printf( "track::draw %d,%d %dx%d\n", X,Y,W,H ); // printf( "track::draw %d,%d %dx%d\n", X,Y,W,H );


// timeline->draw_measure_lines( X, Y, W, H, color() );
timeline->draw_measure_lines( X, Y, W, H );


for ( list <Sequence_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); ++r ) for ( list <Sequence_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); ++r )
(*r)->draw_box(); (*r)->draw_box();


+ 4
- 3
timeline/src/Track.C View File

@@ -125,7 +125,7 @@ Track::init ( void )
Fl_Group::size( timeline->w(), height() ); Fl_Group::size( timeline->w(), height() );


Track *o = this; Track *o = this;
o->box( FL_NO_BOX );
o->box( FL_FLAT_BOX );


{ {
Fl_Group *o = new Fl_Group( 0, 0, 149, 70 ); Fl_Group *o = new Fl_Group( 0, 0, 149, 70 );
@@ -839,6 +839,8 @@ Track::draw ( void )
fl_clip_box( x(), y(), w(), h(), X, Y, W, H ); fl_clip_box( x(), y(), w(), h(), X, Y, W, H );


timeline->draw_measure_lines( X, Y, W, H );

if ( _selected ) if ( _selected )
{ {
Fl_Color c = color(); Fl_Color c = color();
@@ -852,7 +854,6 @@ Track::draw ( void )
else else
Fl_Group::draw(); Fl_Group::draw();


timeline->draw_measure_lines( X, Y, W, H );


fl_pop_clip(); fl_pop_clip();
} }
@@ -883,7 +884,7 @@ Track::handle ( int m )
Logger log( this ); Logger log( this );


if ( ! Fl::event_shift() ) if ( ! Fl::event_shift() )
return 0;
return Fl_Group::handle( m );


int d = Fl::event_dy(); int d = Fl::event_dy();




Loading…
Cancel
Save