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

removed hardcoded widths for dialogs, fixes #425

Browse Source
This commit is contained in:
itsmattkc
2019-02-04 02:33:43 +11:00
parent ee20048c65
commit 5ccabea208
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/aboutdialog.cpp
+1 -2
View File
@@ -7,8 +7,7 @@
AboutDialog::AboutDialog(QWidget *parent) : AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent) QDialog(parent)
{ {
setWindowTitle("About Olive"); setWindowTitle("About Olive");
setMaximumWidth(360);
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);
layout->setSpacing(20); layout->setSpacing(20);
dialogs/demonotice.cpp
+1 -2
View File
@@ -7,8 +7,7 @@
DemoNotice::DemoNotice(QWidget *parent) : DemoNotice::DemoNotice(QWidget *parent) :
QDialog(parent) QDialog(parent)
{ {
setWindowTitle(tr("Welcome to Olive!")); setWindowTitle(tr("Welcome to Olive!"));
setMaximumWidth(600);
QVBoxLayout* vlayout = new QVBoxLayout(this); QVBoxLayout* vlayout = new QVBoxLayout(this);
ui/timelinewidget.cpp
+23 -21
View File
@@ -502,27 +502,29 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
} }
void TimelineWidget::mouseDoubleClickEvent(QMouseEvent *event) { void TimelineWidget::mouseDoubleClickEvent(QMouseEvent *event) {
if (panel_timeline->tool == TIMELINE_TOOL_EDIT) { if (sequence != nullptr) {
int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track); if (panel_timeline->tool == TIMELINE_TOOL_EDIT) {
if (clip_index >= 0) { int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track);
Clip* clip = sequence->clips.at(clip_index); if (clip_index >= 0) {
if (!(event->modifiers() & Qt::ShiftModifier)) sequence->selections.clear(); Clip* clip = sequence->clips.at(clip_index);
Selection s; if (!(event->modifiers() & Qt::ShiftModifier)) sequence->selections.clear();
s.in = clip->timeline_in; Selection s;
s.out = clip->timeline_out; s.in = clip->timeline_in;
s.track = clip->track; s.out = clip->timeline_out;
sequence->selections.append(s); s.track = clip->track;
update_ui(false); sequence->selections.append(s);
} update_ui(false);
} else if (panel_timeline->tool == TIMELINE_TOOL_POINTER) { }
int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track); } else if (panel_timeline->tool == TIMELINE_TOOL_POINTER) {
if (clip_index >= 0) { int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track);
Clip* c = sequence->clips.at(clip_index); if (clip_index >= 0) {
if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) { Clip* c = sequence->clips.at(clip_index);
set_sequence(c->media->to_sequence()); if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) {
} set_sequence(c->media->to_sequence());
} }
} }
}
}
} }
bool isLiveEditing() { bool isLiveEditing() {