razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #1542 from shun-iwasawa/fix_boolean_tooloption

Browse source 
Fix Boolean Tool Options Behavior with Shortcuts
This commit is contained in:
Jeremy Bullock 2017-11-07 13:52:46 -07:00 committed by GitHub
commit 963e9f6f25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
toonz/sources/tnztools/tooloptions.cpp
View file

@ -306,8 +306,10 @@ void ToolOptionControlBuilder::visit(TBoolProperty *p) {
std::string actionName = "A_ToolOption_" + p->getId();
QAction *a = CommandManager::instance()->getAction(actionName.c_str());
if (a) {
a->setCheckable(true);
control->addAction(a);
QObject::connect(a, SIGNAL(triggered()), control, SLOT(doClick()));
QObject::connect(a, SIGNAL(triggered(bool)), control,
SLOT(doClick(bool)));
}
}
hLayout()->addSpacing(5);
@ -553,10 +555,11 @@ ArrowToolOptionsBox::ArrowToolOptionsBox(
m_lockNSCenterCheckbox =
new ToolOptionCheckbox(m_tool, lockProp, toolHandle, this);
TBoolProperty *prop =
TBoolProperty *globalKeyProp =
dynamic_cast<TBoolProperty *>(m_pg->getProperty("Global Key"));
if (prop)
m_globalKey = new ToolOptionCheckbox(m_tool, prop, toolHandle, this);
if (globalKeyProp)
m_globalKey =
new ToolOptionCheckbox(m_tool, globalKeyProp, toolHandle, this);
m_lockEWPosCheckbox->setObjectName("EditToolLockButton");
m_lockNSPosCheckbox->setObjectName("EditToolLockButton");
@ -812,6 +815,16 @@ ArrowToolOptionsBox::ArrowToolOptionsBox(
connect(m_maintainCombo, SIGNAL(currentIndexChanged(int)), m_scaleVField,
SLOT(onScaleTypeChanged(int)));
}
if (globalKeyProp) {
std::string actionName = "A_ToolOption_" + globalKeyProp->getId();
QAction *a = CommandManager::instance()->getAction(actionName.c_str());
if (a) {
a->setCheckable(true);
m_globalKey->addAction(a);
connect(a, SIGNAL(triggered(bool)), m_globalKey, SLOT(doClick(bool)));
}
}
}
//-----------------------------------------------------------------------------

22
toonz/sources/tnztools/tooloptionscontrols.cpp
View file

@ -102,6 +102,11 @@ ToolOptionCheckbox::ToolOptionCheckbox(TTool *tool, TBoolProperty *property,
void ToolOptionCheckbox::updateStatus() {
bool check = m_property->getValue();
if (!actions().isEmpty() && actions()[0]->isCheckable() &&
actions()[0]->isChecked() != check)
actions()[0]->setChecked(check);
if (isChecked() == check) return;
setCheckState(check ? Qt::Checked : Qt::Unchecked);
@ -109,19 +114,16 @@ void ToolOptionCheckbox::updateStatus() {
//-----------------------------------------------------------------------------
void ToolOptionCheckbox::nextCheckState() {
QAbstractButton::nextCheckState();
m_property->setValue(checkState() == Qt::Checked);
notifyTool();
}
//-----------------------------------------------------------------------------
void ToolOptionCheckbox::doClick() {
void ToolOptionCheckbox::doClick(bool checked) {
if (m_toolHandle && m_toolHandle->getTool() != m_tool) return;
// active only if the belonging combo-viewer is visible
if (!isInVisibleViewer(this)) return;
click();
if (isChecked() == checked) return;
setChecked(checked);
m_property->setValue(checked);
notifyTool();
}
//=============================================================================

5
toonz/sources/tnztools/tooloptionscontrols.h
View file

@ -93,10 +93,7 @@ public:
ToolHandle *toolHandle = 0, QWidget *parent = 0);
void updateStatus() override;
public slots:
void doClick();
protected:
void nextCheckState() override;
void doClick(bool);
};
//-----------------------------------------------------------------------------