mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beta

Browse Source
This commit is contained in:
David Capello 2021-06-07 14:39:17 -03:00
commit 2c56ebdd8c
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laf

@ -1 +1 @@
Subproject commit 6d9946795d3c7b3092c6dafc1f6e575f738ae9fd
Subproject commit 52818bcf9b7fab3bcaae01c460a6fd7a2869fb12

30
src/app/file/file.cpp
View File

@ -473,14 +473,28 @@ FileOp* FileOp::createSaveDocumentOperation(const Context* context,
#ifdef ENABLE_UI
// Interative
if (context && context->isUIAvailable()) {
int ret = OptionalAlert::show(
Preferences::instance().saveFile.showFileFormatDoesntSupportAlert,
1, // Yes is the default option when the alert dialog is disabled
fmt::format(
(fatal ? Strings::alerts_file_format_doesnt_support_error():
Strings::alerts_file_format_doesnt_support_warning()),
fop->m_format->name(),
warnings));
auto& showAlertOption = Preferences::instance().saveFile.showFileFormatDoesntSupportAlert;
int ret;
// If the error is fatal, we cannot ignore a no-op, we always
// show the alert dialog.
if (fatal) {
ui::Alert::show(
fmt::format(
Strings::alerts_file_format_doesnt_support_error(),
fop->m_format->name(),
warnings));
ret = 1;
}
else {
ret = OptionalAlert::show(
Preferences::instance().saveFile.showFileFormatDoesntSupportAlert,
1, // Yes is the default option when the alert dialog is disabled
fmt::format(
Strings::alerts_file_format_doesnt_support_warning(),
fop->m_format->name(),
warnings));
}
// Operation can't be done (by fatal error) or the user cancel
// the operation

2
src/app/ui/dithering_selector.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2019-2020 Igara Studio S.A.
// Copyright (C) 2019-2021 Igara Studio S.A.
// Copyright (C) 2017 David Capello
//
// This program is distributed under the terms of

7
src/app/ui/skin/skin_theme.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2019-2020 Igara Studio S.A.
// Copyright (C) 2019-2021 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
@ -239,6 +239,11 @@ SkinTheme::~SkinTheme()
m_sheet.reset();
m_parts_by_id.clear();
// Delete all styles.
for (auto style : m_styles)
delete style.second;
m_styles.clear();
// Destroy fonts
for (auto& kv : m_fonts)
delete kv.second; // Delete all FontDatas