From 5ccabea2086f689fcbfc7b46a4a3e508787b59ef Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 4 Feb 2019 02:33:43 +1100 Subject: [PATCH] removed hardcoded widths for dialogs, fixes #425 --- dialogs/aboutdialog.cpp | 3 +-- dialogs/demonotice.cpp | 3 +-- ui/timelinewidget.cpp | 44 +++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dialogs/aboutdialog.cpp b/dialogs/aboutdialog.cpp index 3f595143c..2d97ce95b 100644 --- a/dialogs/aboutdialog.cpp +++ b/dialogs/aboutdialog.cpp @@ -7,8 +7,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) { - setWindowTitle("About Olive"); - setMaximumWidth(360); + setWindowTitle("About Olive"); QVBoxLayout* layout = new QVBoxLayout(this); layout->setSpacing(20); diff --git a/dialogs/demonotice.cpp b/dialogs/demonotice.cpp index 7dc0e609e..26fa72c1a 100644 --- a/dialogs/demonotice.cpp +++ b/dialogs/demonotice.cpp @@ -7,8 +7,7 @@ DemoNotice::DemoNotice(QWidget *parent) : QDialog(parent) { - setWindowTitle(tr("Welcome to Olive!")); - setMaximumWidth(600); + setWindowTitle(tr("Welcome to Olive!")); QVBoxLayout* vlayout = new QVBoxLayout(this); diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp index a3d512125..3997b2115 100644 --- a/ui/timelinewidget.cpp +++ b/ui/timelinewidget.cpp @@ -502,27 +502,29 @@ void TimelineWidget::dropEvent(QDropEvent* event) { } void TimelineWidget::mouseDoubleClickEvent(QMouseEvent *event) { - if (panel_timeline->tool == TIMELINE_TOOL_EDIT) { - int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track); - if (clip_index >= 0) { - Clip* clip = sequence->clips.at(clip_index); - if (!(event->modifiers() & Qt::ShiftModifier)) sequence->selections.clear(); - Selection s; - s.in = clip->timeline_in; - s.out = clip->timeline_out; - s.track = clip->track; - 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); - if (clip_index >= 0) { - Clip* c = sequence->clips.at(clip_index); - if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) { - set_sequence(c->media->to_sequence()); - } - } - } + if (sequence != nullptr) { + if (panel_timeline->tool == TIMELINE_TOOL_EDIT) { + int clip_index = getClipIndexFromCoords(panel_timeline->cursor_frame, panel_timeline->cursor_track); + if (clip_index >= 0) { + Clip* clip = sequence->clips.at(clip_index); + if (!(event->modifiers() & Qt::ShiftModifier)) sequence->selections.clear(); + Selection s; + s.in = clip->timeline_in; + s.out = clip->timeline_out; + s.track = clip->track; + 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); + if (clip_index >= 0) { + Clip* c = sequence->clips.at(clip_index); + if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) { + set_sequence(c->media->to_sequence()); + } + } + } + } } bool isLiveEditing() {