mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync colors between the TagWindow color picker <-> user data color picker

Browse Source
This commit is contained in:
David Capello 2020-08-21 19:25:47 -03:00
parent be7fa67b61
commit 18454cf5fa
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/ui/tag_window.cpp
View File

@ -68,13 +68,26 @@ doc::AniDir TagWindow::aniDirValue()
void TagWindow::onPopupUserData() void TagWindow::onPopupUserData()
{ {
// Required because we are showing the color in the TagWindow so we
// have to put the color in the user data before showing the same
// color again in the user data tooltip.
//
// TODO remove this field in the future
app::Color c = color()->getColor();
m_userData.setColor(doc::rgba(c.getRed(),
c.getGreen(),
c.getBlue(),
c.getAlpha()));
if (show_user_data_popup(userData()->bounds(), m_userData)) { if (show_user_data_popup(userData()->bounds(), m_userData)) {
color_t color = m_userData.color(); color_t d = m_userData.color();
// Paint the tag properties color picker // And synchronize back the color from the user data with the
app::Color c; // color in the tag properties color picker.
this->color()->setColor(c.fromRgb(int(rgba_getr(color)), color()->setColor(
int(rgba_getg(color)), app::Color::fromRgb(int(rgba_getr(d)),
int(rgba_getb(color)), 255)); int(rgba_getg(d)),
int(rgba_getb(d)),
int(rgba_geta(d))));
} }
} }