various fixes
This commit is contained in:
@@ -68,9 +68,6 @@
|
||||
<property name="expandsOnDoubleClick">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<attribute name="headerDefaultSectionSize">
|
||||
<number>200</number>
|
||||
</attribute>
|
||||
<attribute name="headerStretchLastSection">
|
||||
<bool>true</bool>
|
||||
</attribute>
|
||||
|
||||
+25
-25
@@ -21,30 +21,32 @@
|
||||
#include <QtMath>
|
||||
|
||||
Timeline::Timeline(QWidget *parent) :
|
||||
QDockWidget(parent),
|
||||
ui(new Ui::Timeline)
|
||||
QDockWidget(parent),
|
||||
selecting(false),
|
||||
moving_init(false),
|
||||
moving_proc(false),
|
||||
splitting(false),
|
||||
importing(false),
|
||||
playing(false),
|
||||
trim_in_point(false),
|
||||
snapped(false),
|
||||
rect_select_init(false),
|
||||
rect_select_proc(false),
|
||||
edit_tool_selects_links(false),
|
||||
edit_tool_also_seeks(false),
|
||||
select_also_seeks(false),
|
||||
using_workarea(false),
|
||||
paste_seeks(true),
|
||||
snapping(true),
|
||||
last_frame(0),
|
||||
playhead(0),
|
||||
snap_point(0),
|
||||
cursor_frame(0),
|
||||
cursor_track(0),
|
||||
trim_target(-1),
|
||||
zoom(1.0),
|
||||
ui(new Ui::Timeline)
|
||||
{
|
||||
selecting = false;
|
||||
moving_init = false;
|
||||
moving_proc = false;
|
||||
splitting = false;
|
||||
importing = false;
|
||||
playing = false;
|
||||
trim_in_point = false;
|
||||
snapped = false;
|
||||
rect_select_init = false;
|
||||
rect_select_proc = false;
|
||||
edit_tool_selects_links = false;
|
||||
edit_tool_also_seeks = false;
|
||||
select_also_seeks = false;
|
||||
paste_seeks = true;
|
||||
snapping = true;
|
||||
last_frame = 0;
|
||||
playhead = 0;
|
||||
snap_point = 0;
|
||||
cursor_frame = 0;
|
||||
cursor_track = 0;
|
||||
trim_target = -1;
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -60,8 +62,6 @@ Timeline::Timeline(QWidget *parent) :
|
||||
|
||||
ui->toolArrowButton->click();
|
||||
|
||||
zoom = 1.0f;
|
||||
|
||||
update_sequence();
|
||||
|
||||
connect(&playback_updater, SIGNAL(timeout()), this, SLOT(repaint_timeline()));
|
||||
|
||||
+5
-1
@@ -94,6 +94,10 @@ public:
|
||||
|
||||
long playhead;
|
||||
|
||||
bool using_workarea;
|
||||
long workarea_in;
|
||||
long workarea_out;
|
||||
|
||||
// playback functions
|
||||
void go_to_start();
|
||||
void previous_frame();
|
||||
@@ -118,7 +122,7 @@ public:
|
||||
int tool;
|
||||
long cursor_frame;
|
||||
int cursor_track;
|
||||
float zoom;
|
||||
double zoom;
|
||||
long drag_frame_start;
|
||||
int drag_track_start;
|
||||
void redraw_all_clips(bool changed);
|
||||
|
||||
Reference in New Issue
Block a user