Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Onion skin panel touchups #1589

Merged
merged 3 commits into from
Apr 5, 2021
Merged

Onion skin panel touchups #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc17963
Group sections of onion skin widget with QGroupBox
scribblemaniac Mar 27, 2021
6afe1f1
Use FlowLayout for laying out the distributed opacity onion skin section
scribblemaniac Mar 27, 2021
12b3200
Fix QGroupBox margins and spacing
scribblemaniac Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions app/src/onionskinwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ GNU General Public License for more details.

#include "preferencemanager.h"
#include "editor.h"
#include "flowlayout.h"
#include "util.h"

OnionSkinWidget::OnionSkinWidget(QWidget *parent) :
BaseDockWidget(parent),
ui(new Ui::OnionSkin)
{
ui->setupUi(this);

clearFocusOnFinished(ui->onionPrevFramesNumBox);
clearFocusOnFinished(ui->onionNextFramesNumBox);
clearFocusOnFinished(ui->onionMinOpacityBox);
Expand All @@ -42,6 +44,18 @@ void OnionSkinWidget::initUI()
updateUI();
makeConnections();

// Change the horizontal layout in the Distributed Opacity group box to a
// flow layout to reduce the minimum width
FlowLayout *opacityLayout = new FlowLayout;
opacityLayout->setAlignment(Qt::AlignHCenter);
opacityLayout->setContentsMargins(0, 6, 0, 6);
ui->opacityGroup->layout()->removeWidget(ui->minOpacityGroup);
ui->opacityGroup->layout()->removeWidget(ui->maxOpacityGroup);
opacityLayout->addWidget(ui->minOpacityGroup);
opacityLayout->addWidget(ui->maxOpacityGroup);
delete ui->opacityGroup->layout();
ui->opacityGroup->setLayout(opacityLayout);

#ifdef __APPLE__
// Mac only style. ToolButtons are naturally borderless on Win/Linux.
QString stylesheet =
Expand Down
Loading