mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 05:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix using UI widgets from background thread on ChangePixelFormat + merge layers checkbox

Browse Source
This commit is contained in:
David Capello 2019-04-03 11:34:36 -03:00
parent 495058e8ff
commit 02aa8f2205
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/commands/cmd_change_pixel_format.cpp
View File

@ -496,18 +496,25 @@ void ChangePixelFormatCommand::onExecute(Context* context)
{ {
const ContextReader reader(context); const ContextReader reader(context);
SpriteJob job(reader, "Color Mode Change"); SpriteJob job(reader, "Color Mode Change");
const bool newBlend = Preferences::instance().experimental.newBlend(); Sprite* sprite(job.sprite());
// TODO this was moved in the main UI thread because
// cmd::FlattenLayers() generates a EditorObserver::onAfterLayerChanged()
// event, and that event is an UI event.
// We should refactor the whole app to separate doc changes <-> UI changes,
// but that is for the future:
// https://github.com/aseprite/aseprite/issues/509
// https://github.com/aseprite/aseprite/issues/378
if (flatten) {
const bool newBlend = Preferences::instance().experimental.newBlend();
SelectedLayers selLayers;
for (auto layer : sprite->root()->layers())
selLayers.insert(layer);
job.tx()(new cmd::FlattenLayers(sprite, selLayers, newBlend));
}
job.startJobWithCallback( job.startJobWithCallback(
[this, &job, flatten, newBlend] { [this, &job, sprite] {
Sprite* sprite(job.sprite());
if (flatten) {
SelectedLayers selLayers;
for (auto layer : sprite->root()->layers())
selLayers.insert(layer);
job.tx()(new cmd::FlattenLayers(sprite, selLayers, newBlend));
}
job.tx()( job.tx()(
new cmd::SetPixelFormat( new cmd::SetPixelFormat(
sprite, m_format, sprite, m_format,