mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Fix more bugs with keyboard shortcuts.
This commit is contained in:
Person 2020-01-31 16:21:23 -08:00
parent c1d336b693
commit 541185df8c
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Source/Fractorium/Fractorium.cpp
View File

@ -491,38 +491,56 @@ bool Fractorium::eventFilter(QObject* o, QEvent* e)
} }
else if (ke->key() == Qt::Key_P) else if (ke->key() == Qt::Key_P)
{ {
pcount++; if (!ctrl)
if (pcount >= times)
{ {
pcount = 0; pcount++;
if (!shift) if (pcount >= times)
ui.ActionDrawPreAffines->setChecked(!ui.ActionDrawPreAffines->isChecked()); {
else pcount = 0;
ui.ActionDrawPostAffines->setChecked(!ui.ActionDrawPostAffines->isChecked());
if (!shift)
{
ui.ActionDrawPreAffines->setChecked(!ui.ActionDrawPreAffines->isChecked());
OnActionDrawAffines(ui.ActionDrawPreAffines->isChecked());
}
else
{
ui.ActionDrawPostAffines->setChecked(!ui.ActionDrawPostAffines->isChecked());
OnActionDrawAffines(ui.ActionDrawPostAffines->isChecked());
}
}
return true;
} }
return true;
} }
else if (ke->key() == Qt::Key_L) else if (ke->key() == Qt::Key_L)
{ {
lcount++; if (!ctrl)
if (lcount >= times)
{ {
lcount = 0; lcount++;
if (!shift) if (lcount >= times)
{ {
if (DrawPreAffines()) lcount = 0;
ui.ActionDrawAllPreAffines->setChecked(!ui.ActionDrawAllPreAffines->isChecked());
}
else if (DrawPostAffines())
ui.ActionDrawAllPostAffines->setChecked(!ui.ActionDrawAllPostAffines->isChecked());
}
return true; if (!shift)
{
if (DrawPreAffines())
{
ui.ActionDrawAllPreAffines->setChecked(!ui.ActionDrawAllPreAffines->isChecked());
OnActionDrawAllAffines(ui.ActionDrawAllPreAffines->isChecked());
}
}
else if (DrawPostAffines())
{
ui.ActionDrawAllPostAffines->setChecked(!ui.ActionDrawAllPostAffines->isChecked());
OnActionDrawAllAffines(ui.ActionDrawAllPostAffines->isChecked());
}
}
return true;
}
} }
else if ((!DrawPreAffines() && pre) || (!DrawPostAffines() && !pre))//Everything below this must be for editing xforms via key press. else if ((!DrawPreAffines() && pre) || (!DrawPostAffines() && !pre))//Everything below this must be for editing xforms via key press.
{ {

1
Source/Fractorium/FractoriumMenus.cpp
View File

@ -768,6 +768,7 @@ void Fractorium::OnActionAlternateEditorImage(bool checked)
{ {
if (DrawPreAffines() || DrawPostAffines()) if (DrawPreAffines() || DrawPostAffines())
{ {
SaveAffineState();
ui.ActionDrawPreAffines->setChecked(false); ui.ActionDrawPreAffines->setChecked(false);
ui.ActionDrawAllPreAffines->setChecked(false); ui.ActionDrawAllPreAffines->setChecked(false);
ui.ActionDrawPostAffines->setChecked(false); ui.ActionDrawPostAffines->setChecked(false);