mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 13:26:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Only allow editing affines via key press when affines are actually shown.

--Code changes
 -Fix up from Michel's merge.
This commit is contained in:
Person
2020-01-25 15:50:53 -08:00
parent e61b77651a
commit 04b87da642
7 changed files with 214 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Fractorium/Fractorium.cpp
View File

@ -234,7 +234,7 @@ Fractorium::~Fractorium()
{
SyncSequenceSettings();
m_VarDialog->SyncSettings();
m_Settings->ShowXforms(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked());
m_Settings->ShowXforms(ui.ActionDrawPreAffines->isChecked() || ui.ActionDrawPostAffines->isChecked());
m_Settings->ShowGrid(ui.ActionDrawGrid->isChecked());
m_Settings->setValue("windowState", saveState());
m_Settings->sync();
@ -487,6 +487,10 @@ bool Fractorium::eventFilter(QObject* o, QEvent* e)
return true;
}
else if (!DrawXforms())//Everything below this must be for editing xforms via key press.
{
return true;
}
else if (ke->key() == Qt::Key_W)
{
wcount++;
@ -1079,8 +1083,6 @@ void Fractorium::SetTabOrders()
w = SetTabOrder(this, w, ui.PreScaleCombo);
w = SetTabOrder(this, w, ui.PreScaleUpButton);
w = SetTabOrder(this, w, ui.PreRandomButton);
w = SetTabOrder(this, w, ui.ShowPreAffineSelectedRadio);
w = SetTabOrder(this, w, ui.ShowPreAffineAllRadio);
w = SetTabOrder(this, w, ui.SwapAffinesButton);
w = SetTabOrder(this, w, ui.PostAffineGroupBox);
w = SetTabOrder(this, w, m_PostX1Spin);
@ -1108,8 +1110,6 @@ void Fractorium::SetTabOrders()
w = SetTabOrder(this, w, ui.PostScaleCombo);
w = SetTabOrder(this, w, ui.PostScaleUpButton);
w = SetTabOrder(this, w, ui.PostRandomButton);
w = SetTabOrder(this, w, ui.ShowPostAffineSelectedRadio);
w = SetTabOrder(this, w, ui.ShowPostAffineAllRadio);
w = SetTabOrder(this, w, ui.PolarAffineCheckBox);
w = SetTabOrder(this, w, ui.LocalPivotRadio);
w = SetTabOrder(this, w, ui.WorldPivotRadio);