oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slightly more footage viewer progress

Browse Source
This commit is contained in:
itsmattkc
2018-10-18 20:11:00 +11:00
parent e2a7aeea98
commit 06bd088999
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/media.h
+4
View File
@@ -54,6 +54,10 @@ struct Media {
PreviewGenerator* preview_gen;
bool using_inout;
long in;
long out;
long get_length_in_frames(double frame_rate);
MediaStream* get_stream_from_file_index(bool video, int index);
void reset();
panels/viewer.cpp
+7 -1
View File
@@ -56,7 +56,13 @@ Viewer::~Viewer() {
}
bool Viewer::is_focused() {
return ui->headers->hasFocus() || ui->openGLWidget->hasFocus();
return ui->headers->hasFocus()
|| ui->openGLWidget->hasFocus()
|| ui->pushButton->hasFocus()
|| ui->pushButton_2->hasFocus()
|| ui->pushButton_3->hasFocus()
|| ui->pushButton_4->hasFocus()
|| ui->pushButton_5->hasFocus();
}
void Viewer::set_main_sequence() {