ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

time::Control Integration First Commit

Browse source
This commit is contained in:
Michael R. Fisher 2011-10-22 19:03:17 -05:00
parent ca634bdd9c
commit c9671b654e
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/widgets/timeline/timeline-ibeam-tool.cpp
View file

@ -47,7 +47,10 @@ IBeamTool::IBeamTool(TimelineBody &timeline_body) :
dragType(None), dragType(None),
pinnedDragTime(), pinnedDragTime(),
scrollSlideRate(0) scrollSlideRate(0)
{ } {
// Connect the timlinebody selection to the selectionControl
this->get_state()->get_selection().accept(selectionControl);
}
IBeamTool::~IBeamTool() IBeamTool::~IBeamTool()
{ {
@ -117,9 +120,14 @@ IBeamTool::on_button_press_event(GdkEventButton* event)
// User began the drag in clear space, begin a Select drag // User began the drag in clear space, begin a Select drag
dragType = Selection; dragType = Selection;
pinnedDragTime = time; pinnedDragTime = time;
state->setSelection (Mutation::changeTime(time)); selectionControl (TimeSpan(time, Duration::NIL));
state->setSelection (Mutation::changeDuration(Duration::NIL)); state->selection_changed_signal().emit();
//////////////////////////////////////////////////////TICKET #797 : this is cheesy. Should provide a single Mutation to change all std::cout << "\n" << std::string(time) << "\n";
std::cout << std::string(state->get_selection().start()) << "\n\n";
//state->setSelection (Mutation::changeTime (time));
//state->setSelection (Mutation::changeDuration (Duration::NIL));
////////////"//////////////////////////////////////////TICKET #797 : this is cheesy. Should provide a single Mutation to change all
} }
} }
} }
@ -193,12 +201,14 @@ IBeamTool::set_leading_x(const int x)
const bool set_playback_period = dragType == Selection; const bool set_playback_period = dragType == Selection;
TimeVar newStartPoint (state->get_view_window().x_to_time(x)); TimeVar newStartPoint (state->get_view_window().x_to_time(x));
Offset selectionLength (pinnedDragTime, newStartPoint); Offset selectionLength (pinnedDragTime, newStartPoint);
if (newStartPoint > pinnedDragTime) if (newStartPoint > pinnedDragTime)
newStartPoint=pinnedDragTime; // use the smaller one as selection start newStartPoint=pinnedDragTime; // use the smaller one as selection start
state->setSelection (Mutation::changeTime(newStartPoint) , set_playback_period); // selectionControl (TimeSpan(newStartPoint, Duration(selectionLength)));
state->setSelection (Mutation::changeDuration(selectionLength), set_playback_period);
//state->setSelection (Mutation::changeTime(newStartPoint) , set_playback_period);
// state->setSelection (Mutation::changeDuration(selectionLength), set_playback_period);
//////////////////////////////////////////////////////TICKET #797 : this is cheesy. Should provide a single Mutation to change all at once //////////////////////////////////////////////////////TICKET #797 : this is cheesy. Should provide a single Mutation to change all at once
} }