mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add context popup menu for regions to set fade-in/out curve.

pull/3/head
Jonathan Moore Liles 2008-04-15 06:44:03 -05:00
parent 81561d6304
commit b3a3be6e55
3 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Timeline/Region.C
View File

@ -27,7 +27,7 @@
#include <FL/Fl_Group.H>
#include <FL/Fl_Widget.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Menu_Item.H>
#include <stdio.h>
#include <algorithm>
@ -256,15 +256,15 @@ Region::handle ( int m )
printf( "setting fade in length to %lu\n", _fade_in.length );
}
else
if ( Fl::event_key() == FL_F + 4 )
{
long offset = length() - x_to_offset( X );
if ( Fl::event_key() == FL_F + 4 )
{
long offset = length() - x_to_offset( X );
if ( offset > 0 )
_fade_out.length = offset;
if ( offset > 0 )
_fade_out.length = offset;
printf( "setting fade out length to %lu\n", _fade_in.length );
}
printf( "setting fade out length to %lu\n", _fade_in.length );
}
redraw();
@ -342,11 +342,48 @@ Region::handle ( int m )
redraw();
goto changed;
}
if ( Fl::event_button1() && Fl::event_ctrl() )
else if ( Fl::event_button1() && Fl::event_ctrl() )
{
/* duplication */
return 1;
}
else if ( Fl::event_button3() )
{
/* context menu */
Fade::fade_type_e it = _fade_in.type;
Fade::fade_type_e ot = _fade_out.type;
Fl_Menu_Item menu[] =
{
{ "Fade", 0, 0, 0, FL_SUBMENU },
{ "In", 0, 0, 0, FL_SUBMENU },
{ "Linear", 0, 0, 0, FL_MENU_RADIO | ( it == Fade::Linear ? FL_MENU_VALUE : 0 ) },
{ "Sigmoid", 0, 0, 0, FL_MENU_RADIO | ( it == Fade::Sigmoid ? FL_MENU_VALUE : 0 ) },
{ "Logarithmic", 0, 0, 0, FL_MENU_RADIO | ( it == Fade::Logarithmic ? FL_MENU_VALUE : 0 ) },
{ "Parabolic", 0, 0, 0, FL_MENU_RADIO | ( it == Fade::Parabolic ? FL_MENU_VALUE : 0 ) },
{ 0 },
{ "Out", 0, 0, 0, FL_SUBMENU },
{ "Linear", 0, 0, 0, FL_MENU_RADIO | ( ot == Fade::Linear ? FL_MENU_VALUE : 0 ) },
{ "Sigmoid", 0, 0, 0, FL_MENU_RADIO | ( ot == Fade::Sigmoid ? FL_MENU_VALUE : 0 ) },
{ "Logarothmic", 0, 0, 0, FL_MENU_RADIO | ( ot == Fade::Logarithmic ? FL_MENU_VALUE : 0 ) },
{ "Parabolic", 0, 0, 0, FL_MENU_RADIO | ( ot == Fade::Parabolic ? FL_MENU_VALUE : 0 ) },
{ 0 },
{ 0 },
{ 0 },
};
const Fl_Menu_Item *r = menu->popup( X, Y, "Region" );
if ( r )
{
if ( r > &menu[1] && r < &menu[6] )
_fade_in.type = (Fade::fade_type_e)(int)(r - &menu[2]);
else if ( r > &menu[7] && r < &menu[12] )
_fade_out.type = (Fade::fade_type_e)(int)(r - &menu[8]);
}
}
else
return Track_Widget::handle( m );
}

2
Timeline/Region.H
View File

@ -41,7 +41,7 @@ public:
struct Fade
{
enum fade_type_e { Linear, Sigmoid, Logarithmic, Parabolic };
enum fade_type_e { Linear = 0, Sigmoid, Logarithmic, Parabolic };
enum fade_dir_e { In, Out };
fade_type_e type;

1
Timeline/main.C
View File

@ -72,7 +72,6 @@ main ( int argc, char **argv )
Fl::scheme( "plastic" );
// Fl::scheme( "gtk+" );
Loggable::open( "history" );
/* welcome to C++ */
Loggable::register_create( "Region", &Region::create );