merged with master

This commit is contained in:
itsmattkc
2019-01-28 23:14:17 +11:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -78,6 +78,7 @@ Project::Project(QWidget *parent) :
// optional toolbar
toolbar_widget = new QWidget();
toolbar_widget->setVisible(config.show_project_toolbar);
toolbar_widget->setObjectName("project_toolbar");
QHBoxLayout* toolbar = new QHBoxLayout();
toolbar->setMargin(0);
toolbar->setSpacing(0);
@@ -129,7 +130,6 @@ Project::Project(QWidget *parent) :
toolbar->addWidget(toolbar_redo);
toolbar->addStretch();
QPushButton* toolbar_tree_view = new QPushButton(toolbar_widget);
QIcon icon6;
icon6.addFile(QStringLiteral(":/icons/treeview.png"), QSize(), QIcon::Normal, QIcon::On);
+1
View File
@@ -1649,6 +1649,7 @@ void Timeline::setup_ui() {
tool_button_widget = new QWidget(dockWidgetContents);
tool_button_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
tool_button_widget->setObjectName("timeline_toolbar");
FlowLayout* tool_buttons_layout = new FlowLayout(tool_button_widget);
// tool_buttons_layout->setSizeConstraint(QLayout::SetNoConstraint);