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

HOT progress on keyframing and fixed invert filter for GL ES

Browse Source
This commit is contained in:
itsmattkc
2018-08-19 20:32:49 +10:00
parent 859a17dfda
commit d724a06e5a
6 changed files with 251 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/effectcontrols.cpp
-3
View File
@@ -144,12 +144,10 @@ void EffectControls::clear_effects(bool clear_cache) {
while ((item = video_layout->takeAt(0))) {
item->widget()->setParent(NULL);
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(visibleChanged()), ui->keyframeView, SLOT(reload()));
}
while ((item = audio_layout->takeAt(0))) {
item->widget()->setParent(NULL);
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(visibleChanged()), ui->keyframeView, SLOT(reload()));
}
ui->vcontainer->setVisible(false);
ui->acontainer->setVisible(false);
@@ -189,7 +187,6 @@ void EffectControls::load_effects() {
ui->acontainer->setVisible(true);
}
connect(container, SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
connect(container, SIGNAL(visibleChanged()), ui->keyframeView, SLOT(reload()));
}
}
if (selected_clips.size() > 0) {
panels/effectcontrols.h
+2 -1
View File
@@ -36,11 +36,12 @@ public:
void delete_effects();
bool is_focused();
void reload_clips();
void update_keyframes();
void set_zoom(bool in);
bool keyframe_focus();
double zoom;
public slots:
void update_keyframes();
private slots:
void menu_select(QAction* q);
void on_add_video_effect_button_clicked();