mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't modify hex field when "edit palette mode" is enabled and the color is modified from the same hex field

Browse Source 
Close #1632, #1636, #1637
This commit is contained in:
David Capello 2018-02-19 21:18:41 -03:00
parent 6012f2389f
commit 5d9bbe6651
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/ui/color_popup.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2017 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -23,6 +23,7 @@
#include "app/modules/palettes.h"
#include "app/resource_finder.h"
#include "app/transaction.h"
#include "app/ui/color_bar.h"
#include "app/ui/palette_view.h"
#include "app/ui/skin/skin_theme.h"
#include "app/ui_context.h"
@ -387,7 +388,12 @@ void ColorPopup::onColorHexEntryChange(const app::Color& color)
setColorWithSignal(color, ChangeType);
findBestfitIndex(color);
m_disableHexUpdate = false;
// If we are in edit mode, the "m_disableHexUpdate" will be changed
// to false in onPaletteChange() after the color bar timer is
// triggered. In this way we don't modify the hex field when the
// user is editing it and the palette "edit mode" is enabled.
if (!inEditMode())
m_disableHexUpdate = false;
}
void ColorPopup::onSimpleColorClick()
@ -462,6 +468,9 @@ void ColorPopup::onPaletteChange()
{
setColor(getColor(), DontChangeType);
invalidate();
if (inEditMode())
m_disableHexUpdate = false;
}
void ColorPopup::findBestfitIndex(const app::Color& color)
@ -539,4 +548,14 @@ void ColorPopup::selectColorType(app::Color::Type type)
m_vbox.invalidate();
}
bool ColorPopup::inEditMode()
{
return
// TODO use other flag instead of m_canPin, here we want to ask if
// this ColorPopup is related to the main ColorBar (instead of
// other ColorButtons like the one in "Replace Color", etc.)
(m_canPin) &&
(ColorBar::instance()->inEditMode());
}
} // namespace app

3
src/app/ui/color_popup.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2017 David Capello
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -62,6 +62,7 @@ namespace app {
void setColorWithSignal(const app::Color& color,
const SetColorOptions options);
void findBestfitIndex(const app::Color& color);
bool inEditMode();
class SimpleColors;
class CustomButtonSet : public ButtonSet {