这是indexloc提供的服务，不要输入任何密码
Skip to content

Use checkboxes instead of tool buttons in onion skin widget #1753

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

Merged
merged 3 commits into from
Oct 1, 2023
Merged

Use checkboxes instead of tool buttons in onion skin widget #1753

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
f788e73
Use checkboxes instead of tool buttons in onion skin widget
J5lx Apr 2, 2023
d0ff89c
Improve styling of group box on Mac OS
MrStevns Oct 1, 2023
d3b7f8c
Merge branch 'master' into enhancements/onionskin-groupbox-checkbox
MrStevns Oct 1, 2023
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
32 changes: 20 additions & 12 deletions app/src/onionskinwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,23 @@ void OnionSkinWidget::initUI()
ui->opacityGroup->setLayout(opacityLayout);

#ifdef __APPLE__

ui->scrollAreaWidgetContents->layout()->setSpacing(8);

// Mac only style. ToolButtons are naturally borderless on Win/Linux.
QString stylesheet =
"QToolButton { border: 0px; } "
"QGroupBox::title {"
"subcontrol-origin: padding;"
"left: 6px;"
"padding: 2px 2px 0px 0px;"
"background: transparent;"
"}"
"QGroupBox {"
"subcontrol-origin: margin;"
"margin-top: 8px;"
"padding-top: 16px;"
"}"
"QToolButton:pressed{ border: 1px solid #FFADAD; border-radius: 2px; background-color: #D5D5D5; }"
"QToolButton:checked{ border: 1px solid #ADADAD; border-radius: 2px; background-color: #D5D5D5; }";
setStyleSheet(this->styleSheet().append(stylesheet));
Expand All @@ -74,8 +88,8 @@ void OnionSkinWidget::makeConnections()
connect(ui->onionPrevFramesNumBox, spinBoxChanged, this, &OnionSkinWidget::onionPrevFramesNumChange);
connect(ui->onionNextFramesNumBox, spinBoxChanged, this, &OnionSkinWidget::onionNextFramesNumChange);

connect(ui->onionPrevButton, &QToolButton::clicked, this, &OnionSkinWidget::onionPrevButtonClicked);
connect(ui->onionNextButton, &QToolButton::clicked, this, &OnionSkinWidget::onionNextButtonClicked);
connect(ui->prevFramesGroup, &QGroupBox::clicked, this, &OnionSkinWidget::prevFramesGroupClicked);
connect(ui->nextFramesGroup, &QGroupBox::clicked, this, &OnionSkinWidget::nextFramesGroupClicked);
connect(ui->onionBlueButton, &QToolButton::clicked, this, &OnionSkinWidget::onionBlueButtonClicked);
connect(ui->onionRedButton, &QToolButton::clicked, this, &OnionSkinWidget::onionRedButtonClicked);

Expand All @@ -91,18 +105,12 @@ void OnionSkinWidget::updateUI()
{
PreferenceManager* prefs = editor()->preference();

QSignalBlocker b1(ui->onionPrevButton);
ui->onionPrevButton->setChecked(prefs->isOn(SETTING::PREV_ONION));

QSignalBlocker b2(ui->onionNextButton);
ui->onionNextButton->setChecked(prefs->isOn(SETTING::NEXT_ONION));
ui->prevFramesGroup->setChecked(prefs->isOn(SETTING::PREV_ONION));
ui->nextFramesGroup->setChecked(prefs->isOn(SETTING::NEXT_ONION));

QSignalBlocker b3(ui->onionBlueButton);
ui->onionBlueButton->setChecked(prefs->isOn(SETTING::ONION_BLUE));

ui->onionRedButton->setEnabled(ui->onionPrevButton->isChecked());
ui->onionBlueButton->setEnabled(ui->onionNextButton->isChecked());

QSignalBlocker b4(ui->onionRedButton);
ui->onionRedButton->setChecked(prefs->isOn(SETTING::ONION_RED));

Expand All @@ -119,13 +127,13 @@ void OnionSkinWidget::updateUI()

}

void OnionSkinWidget::onionPrevButtonClicked(bool isOn)
void OnionSkinWidget::prevFramesGroupClicked(bool isOn)
{
PreferenceManager* prefs = editor()->preference();
prefs->set(SETTING::PREV_ONION, isOn);
}

void OnionSkinWidget::onionNextButtonClicked(bool isOn)
void OnionSkinWidget::nextFramesGroupClicked(bool isOn)
{
PreferenceManager* prefs = editor()->preference();
prefs->set(SETTING::NEXT_ONION, isOn);
Expand Down
4 changes: 2 additions & 2 deletions app/src/onionskinwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class OnionSkinWidget : public BaseDockWidget

private slots:
void playbackStateChanged(int);
void onionPrevButtonClicked(bool);
void onionNextButtonClicked(bool);
void prevFramesGroupClicked(bool);
void nextFramesGroupClicked(bool);
void onionBlueButtonClicked(bool);
void onionRedButtonClicked(bool);
void onionMaxOpacityChange(int);
Expand Down
67 changes: 6 additions & 61 deletions app/ui/onionskin.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
<property name="title">
<string>Previous Frames</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="onionPrevLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
Expand All @@ -120,38 +123,6 @@
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QToolButton" name="onionPrevButton">
<property name="toolTip">
<string>Onion skin previous frame</string>
</property>
<property name="statusTip">
<string>Onion skin previous frame</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../data/app.qrc">
<normaloff>:/app/icons/onionPrev.png</normaloff>:/app/icons/onionPrev.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="onionPrevFramesNumBox">
<property name="sizePolicy">
Expand Down Expand Up @@ -214,6 +185,9 @@
<property name="title">
<string>Next Frames</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="onionNextlLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
Expand All @@ -230,35 +204,6 @@
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QToolButton" name="onionNextButton">
<property name="toolTip">
<string>Onion skin next frame</string>
</property>
<property name="statusTip">
<string>Onion skin next frame</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../data/app.qrc">
<normaloff>:/app/icons/onionNext.png</normaloff>:/app/icons/onionNext.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="onionNextFramesNumBox">
<property name="sizePolicy">
Expand Down