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

fixed missing define and faulty clip selection logic

Browse Source
This commit is contained in:
itsmattkc
2019-03-16 22:54:05 +11:00
parent 791bc0c9b8
commit 445c8299e7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/preferencesdialog.cpp
+2
View File
@@ -260,7 +260,9 @@ void PreferencesDialog::save() {
olive::CurrentConfig.language_file = language_combobox->currentData().toString();
olive::CurrentConfig.style = static_cast<olive::styling::Style>(ui_style->currentData().toInt());
#ifdef Q_OS_WIN
olive::CurrentConfig.use_native_menu_styling = native_menus->isChecked();
#endif
// Check if the thumbnail or waveform icon
if (olive::CurrentConfig.thumbnail_resolution != thumbnail_res_spinbox->value()
timeline/sequence.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ bool Sequence::IsClipSelected(Clip *clip, bool containing)
{
for (int i=0;i<selections.size();i++) {
const Selection& s = selections.at(i);
if (clip->track() == s.track && ((clip->timeline_in() >= s.in && clip->timeline_out() <= s.out && containing)
if (clip->track() == s.track && ((clip->timeline_in() >= s.in && clip->timeline_out() <= s.out)
|| (!containing && !(clip->timeline_in() < s.in && clip->timeline_out() < s.in)
&& !(clip->timeline_in() > s.in && clip->timeline_out() > s.in)))) {
return true;