From 3243ba5a46e3b995b08b9443000a6f574c041f8e Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 22 Jan 2019 11:14:12 +1100 Subject: [PATCH] corrected flow layout in timeline buttons --- panels/timeline.cpp | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/panels/timeline.cpp b/panels/timeline.cpp index 688802df4..56478292d 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -491,21 +491,21 @@ void Timeline::select_from_playhead() { } void Timeline::resizeEvent(QResizeEvent *) { - // adjust maximum scrollbar - if (sequence != nullptr) set_sb_max(); + // adjust maximum scrollbar + if (sequence != nullptr) set_sb_max(); - // resize tool button widget to its contents - QList tool_button_children = tool_button_widget->findChildren(); - int total_client_height = 0; - int layout_spacing = tool_button_widget->layout()->spacing(); - for (int i=0;iheight() + layout_spacing; - } - int comp_height = tool_button_widget->height(); - qDebug() << total_client_height << comp_height << layout_spacing; - int cols = qCeil(double(total_client_height)/double(comp_height)); - tool_button_widget->setFixedWidth((tool_button_children.at(0)->width())*cols + layout_spacing*(cols+1)); + // resize tool button widget to its contents + QList tool_button_children = tool_button_widget->findChildren(); + int total_client_height = 0; + int horizontal_spacing = static_cast(tool_button_widget->layout())->horizontalSpacing(); + int vertical_spacing = static_cast(tool_button_widget->layout())->verticalSpacing(); + for (int i=0;iheight() + vertical_spacing; + } + int comp_height = tool_button_widget->height(); + int cols = qCeil(double(total_client_height)/double(comp_height)); + tool_button_widget->setFixedWidth((tool_button_children.at(0)->width())*cols + horizontal_spacing*(cols)); } void Timeline::delete_in_out(bool ripple) { @@ -1611,15 +1611,15 @@ void Timeline::setup_ui() { horizontalLayout->setSpacing(0); horizontalLayout->setContentsMargins(0, 0, 0, 0); - tool_button_widget = new QWidget(dockWidgetContents); - tool_button_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + tool_button_widget = new QWidget(dockWidgetContents); + tool_button_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - FlowLayout* tool_buttons_layout = new FlowLayout(tool_button_widget); + FlowLayout* tool_buttons_layout = new FlowLayout(tool_button_widget); // tool_buttons_layout->setSizeConstraint(QLayout::SetNoConstraint); tool_buttons_layout->setSpacing(4); tool_buttons_layout->setContentsMargins(0, 0, 0, 0); - toolArrowButton = new QPushButton(tool_button_widget); + toolArrowButton = new QPushButton(tool_button_widget); QIcon arrow_icon; arrow_icon.addFile(QStringLiteral(":/icons/arrow.png"), QSize(), QIcon::Normal, QIcon::Off); arrow_icon.addFile(QStringLiteral(":/icons/arrow-disabled.png"), QSize(), QIcon::Disabled, QIcon::Off); @@ -1628,9 +1628,9 @@ void Timeline::setup_ui() { toolArrowButton->setToolTip(tr("Pointer Tool") + " (V)"); toolArrowButton->setProperty("tool", TIMELINE_TOOL_POINTER); connect(toolArrowButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); - tool_buttons_layout->addWidget(toolArrowButton); + tool_buttons_layout->addWidget(toolArrowButton); - toolEditButton = new QPushButton(tool_button_widget); + toolEditButton = new QPushButton(tool_button_widget); QIcon icon1; icon1.addFile(QStringLiteral(":/icons/beam.png"), QSize(), QIcon::Normal, QIcon::Off); icon1.addFile(QStringLiteral(":/icons/beam-disabled.png"), QSize(), QIcon::Disabled, QIcon::Off); @@ -1641,7 +1641,7 @@ void Timeline::setup_ui() { connect(toolEditButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolEditButton); - toolRippleButton = new QPushButton(tool_button_widget); + toolRippleButton = new QPushButton(tool_button_widget); QIcon icon2; icon2.addFile(QStringLiteral(":/icons/ripple.png"), QSize(), QIcon::Normal, QIcon::Off); icon2.addFile(QStringLiteral(":/icons/ripple-disabled.png"), QSize(), QIcon::Disabled, QIcon::Off); @@ -1652,7 +1652,7 @@ void Timeline::setup_ui() { connect(toolRippleButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolRippleButton); - toolRazorButton = new QPushButton(tool_button_widget); + toolRazorButton = new QPushButton(tool_button_widget); QIcon icon4; icon4.addFile(QStringLiteral(":/icons/razor.png"), QSize(), QIcon::Normal, QIcon::Off); icon4.addFile(QStringLiteral(":/icons/razor-disabled.png"), QSize(), QIcon::Disabled, QIcon::Off); @@ -1663,7 +1663,7 @@ void Timeline::setup_ui() { connect(toolRazorButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolRazorButton); - toolSlipButton = new QPushButton(tool_button_widget); + toolSlipButton = new QPushButton(tool_button_widget); QIcon icon5; icon5.addFile(QStringLiteral(":/icons/slip.png"), QSize(), QIcon::Normal, QIcon::On); icon5.addFile(QStringLiteral(":/icons/slip-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1674,7 +1674,7 @@ void Timeline::setup_ui() { connect(toolSlipButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolSlipButton); - toolSlideButton = new QPushButton(tool_button_widget); + toolSlideButton = new QPushButton(tool_button_widget); QIcon icon6; icon6.addFile(QStringLiteral(":/icons/slide.png"), QSize(), QIcon::Normal, QIcon::On); icon6.addFile(QStringLiteral(":/icons/slide-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1685,7 +1685,7 @@ void Timeline::setup_ui() { connect(toolSlideButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolSlideButton); - toolHandButton = new QPushButton(tool_button_widget); + toolHandButton = new QPushButton(tool_button_widget); QIcon icon7; icon7.addFile(QStringLiteral(":/icons/hand.png"), QSize(), QIcon::Normal, QIcon::On); icon7.addFile(QStringLiteral(":/icons/hand-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1696,7 +1696,7 @@ void Timeline::setup_ui() { connect(toolHandButton, SIGNAL(clicked(bool)), this, SLOT(set_tool())); tool_buttons_layout->addWidget(toolHandButton); - toolTransitionButton = new QPushButton(tool_button_widget); + toolTransitionButton = new QPushButton(tool_button_widget); QIcon icon8; icon8.addFile(QStringLiteral(":/icons/transition-tool.png"), QSize(), QIcon::Normal, QIcon::On); icon8.addFile(QStringLiteral(":/icons/transition-tool-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1706,7 +1706,7 @@ void Timeline::setup_ui() { connect(toolTransitionButton, SIGNAL(clicked(bool)), this, SLOT(transition_tool_click())); tool_buttons_layout->addWidget(toolTransitionButton); - snappingButton = new QPushButton(tool_button_widget); + snappingButton = new QPushButton(tool_button_widget); QIcon icon9; icon9.addFile(QStringLiteral(":/icons/magnet.png"), QSize(), QIcon::Normal, QIcon::On); icon9.addFile(QStringLiteral(":/icons/magnet-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1717,7 +1717,7 @@ void Timeline::setup_ui() { connect(snappingButton, SIGNAL(toggled(bool)), this, SLOT(snapping_clicked(bool))); tool_buttons_layout->addWidget(snappingButton); - zoomInButton = new QPushButton(tool_button_widget); + zoomInButton = new QPushButton(tool_button_widget); QIcon icon10; icon10.addFile(QStringLiteral(":/icons/zoomin.png"), QSize(), QIcon::Normal, QIcon::On); icon10.addFile(QStringLiteral(":/icons/zoomin-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1726,7 +1726,7 @@ void Timeline::setup_ui() { connect(zoomInButton, SIGNAL(clicked(bool)), this, SLOT(zoom_in())); tool_buttons_layout->addWidget(zoomInButton); - zoomOutButton = new QPushButton(tool_button_widget); + zoomOutButton = new QPushButton(tool_button_widget); QIcon icon11; icon11.addFile(QStringLiteral(":/icons/zoomout.png"), QSize(), QIcon::Normal, QIcon::On); icon11.addFile(QStringLiteral(":/icons/zoomout-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1735,7 +1735,7 @@ void Timeline::setup_ui() { connect(zoomOutButton, SIGNAL(clicked(bool)), this, SLOT(zoom_out())); tool_buttons_layout->addWidget(zoomOutButton); - recordButton = new QPushButton(tool_button_widget); + recordButton = new QPushButton(tool_button_widget); QIcon icon12; icon12.addFile(QStringLiteral(":/icons/record.png"), QSize(), QIcon::Normal, QIcon::On); icon12.addFile(QStringLiteral(":/icons/record-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -1745,16 +1745,16 @@ void Timeline::setup_ui() { tool_buttons_layout->addWidget(recordButton); - addButton = new QPushButton(tool_button_widget); + addButton = new QPushButton(tool_button_widget); QIcon icon13; icon13.addFile(QStringLiteral(":/icons/add-button.png"), QSize(), QIcon::Normal, QIcon::On); icon13.addFile(QStringLiteral(":/icons/add-button-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); addButton->setIcon(icon13); addButton->setToolTip(tr("Add title, solid, bars, etc.")); connect(addButton, SIGNAL(clicked()), this, SLOT(add_btn_click())); - tool_buttons_layout->addWidget(addButton); + tool_buttons_layout->addWidget(addButton); - horizontalLayout->addWidget(tool_button_widget); + horizontalLayout->addWidget(tool_button_widget); timeline_area = new QWidget(dockWidgetContents); QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum); @@ -1774,7 +1774,7 @@ void Timeline::setup_ui() { editAreaLayout->setSpacing(0); editAreaLayout->setContentsMargins(0, 0, 0, 0); QSplitter* splitter = new QSplitter(editAreas); - splitter->setChildrenCollapsible(false); + splitter->setChildrenCollapsible(false); splitter->setOrientation(Qt::Vertical); QWidget* videoContainer = new QWidget(splitter); QHBoxLayout* videoContainerLayout = new QHBoxLayout(videoContainer);