mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-17 13:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't change cel user data when cel opacity is the only modified field

Browse Source
This commit is contained in:
David Capello 2016-02-01 18:09:02 -03:00
parent be57d0332f
commit bb41bd32b4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/commands/cmd_cel_properties.cpp
View File

@ -51,7 +51,8 @@ public:
: m_timer(250, this)
, m_document(nullptr)
, m_cel(nullptr)
, m_selfUpdate(false) {
, m_selfUpdate(false)
, m_newUserData(false) {
opacity()->Change.connect(base::Bind<void>(&CelPropertiesWindow::onStartTimer, this));
userData()->Click.connect(base::Bind<void>(&CelPropertiesWindow::onPopupUserData, this));
m_timer.Tick.connect(base::Bind<void>(&CelPropertiesWindow::onCommitChange, this));
@ -193,7 +194,8 @@ private:
transaction.execute(new cmd::SetCelOpacity(cel, newOpacity));
}
if (m_userData != cel->data()->userData()) {
if (m_newUserData &&
m_userData != cel->data()->userData()) {
transaction.execute(new cmd::SetUserData(cel->data(), m_userData));
// Redraw timeline because the cel's user data/color
@ -216,12 +218,14 @@ private:
void onPopupUserData() {
if (countCels() > 0) {
m_newUserData = false;
if (m_cel)
m_userData = m_cel->data()->userData();
else
m_userData = UserData();
if (show_user_data_popup(userData()->bounds(), m_userData)) {
m_newUserData = true;
onCommitChange();
}
}
@ -254,6 +258,7 @@ private:
int count = countCels(&bgCount);
m_userData = UserData();
m_newUserData = false;
if (count > 0) {
if (m_cel) {
@ -273,6 +278,7 @@ private:
DocumentRange m_range;
bool m_selfUpdate;
UserData m_userData;
bool m_newUserData;
};
class CelPropertiesCommand : public Command {