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

FractoriumPalette.cpp edited online with Bitbucket

Browse Source
This commit is contained in:
Michel Mastriani 2019-05-21 22:35:23 +00:00
parent fcdfb0b300
commit 96e8bcdb23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Fractorium/FractoriumPalette.cpp
View File

@ -398,7 +398,7 @@ void FractoriumEmberController<T>::PaletteEditorButtonClicked()
ed->SetPreviousColorIndices(colorIndices); // also necessary because the colors are changed in palette editor ed->SetPreviousColorIndices(colorIndices); // also necessary because the colors are changed in palette editor
ed->SetPaletteFile(m_CurrentPaletteFilePath); ed->SetPaletteFile(m_CurrentPaletteFilePath);
#ifndef __linux__ #ifdef __linux__
ed->show(); ed->show();
#else #else
SyncPalette(ed->exec() == QDialog::Accepted); SyncPalette(ed->exec() == QDialog::Accepted);
@ -427,7 +427,7 @@ void Fractorium::OnPaletteEditorButtonClicked(bool checked)
connect(m_PaletteEditor, SIGNAL(PaletteChanged()), this, SLOT(OnPaletteEditorColorChanged()), Qt::QueuedConnection); connect(m_PaletteEditor, SIGNAL(PaletteChanged()), this, SLOT(OnPaletteEditorColorChanged()), Qt::QueuedConnection);
connect(m_PaletteEditor, SIGNAL(PaletteFileChanged()), this, SLOT(OnPaletteEditorFileChanged()), Qt::QueuedConnection); connect(m_PaletteEditor, SIGNAL(PaletteFileChanged()), this, SLOT(OnPaletteEditorFileChanged()), Qt::QueuedConnection);
connect(m_PaletteEditor, SIGNAL(ColorIndexChanged(size_t, float)), this, SLOT(OnPaletteEditorColorIndexChanged(size_t, float)), Qt::QueuedConnection); connect(m_PaletteEditor, SIGNAL(ColorIndexChanged(size_t, float)), this, SLOT(OnPaletteEditorColorIndexChanged(size_t, float)), Qt::QueuedConnection);
#ifndef __linux__ #ifdef __linux__
connect(m_PaletteEditor, SIGNAL(finished(int)), this, SLOT(OnPaletteEditorFinished(int)), Qt::QueuedConnection); connect(m_PaletteEditor, SIGNAL(finished(int)), this, SLOT(OnPaletteEditorFinished(int)), Qt::QueuedConnection);
#endif #endif
} }