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

Update DitherItem preview when the palette is modified

Browse Source
This commit is contained in:
David Capello 2017-06-01 18:18:44 -03:00
parent 7a75751dd7
commit 2c02e67ebc
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,16 +38,31 @@ public:
const std::string& text) const std::string& text)
: ListItem(text) : ListItem(text)
, m_algo(algo) , m_algo(algo)
, m_matrix(matrix) { , m_matrix(matrix)
generatePreview(); , m_preview(nullptr)
, m_palId(0)
, m_palMods(0)
{
} }
render::DitheringAlgorithm algo() const { return m_algo; } render::DitheringAlgorithm algo() const { return m_algo; }
render::DitheringMatrix matrix() const { return m_matrix; } render::DitheringMatrix matrix() const { return m_matrix; }
private: private:
void generatePreview() { she::Surface* preview() {
const doc::Palette* palette = get_current_palette(); const doc::Palette* palette = get_current_palette();
ASSERT(palette);
if (m_preview) {
// Reuse the preview in case that the palette is exactly the same
if (palette->id() == m_palId &&
palette->getModifications() == m_palMods)
return m_preview;
// In other case regenerate the preview for the current palette
m_preview->dispose();
m_preview = nullptr;
}
const int w = 128, h = 16; const int w = 128, h = 16;
doc::ImageRef image1(doc::Image::create(doc::IMAGE_RGB, w, h)); doc::ImageRef image1(doc::Image::create(doc::IMAGE_RGB, w, h));
@ -67,13 +82,17 @@ private:
m_preview = she::instance()->createRgbaSurface(w, h); m_preview = she::instance()->createRgbaSurface(w, h);
doc::convert_image_to_surface(image2.get(), palette, m_preview, doc::convert_image_to_surface(image2.get(), palette, m_preview,
0, 0, 0, 0, w, h); 0, 0, 0, 0, w, h);
m_palId = palette->id();
m_palMods = palette->getModifications();
return m_preview;
} }
void onSizeHint(SizeHintEvent& ev) override { void onSizeHint(SizeHintEvent& ev) override {
gfx::Size sz = textSize(); gfx::Size sz = textSize();
sz.w = MAX(sz.w, m_preview->width()) + 4*guiscale(); sz.w = MAX(sz.w, preview()->width()) + 4*guiscale();
sz.h += 6*guiscale() + m_preview->height(); sz.h += 6*guiscale() + preview()->height();
ev.setSizeHint(sz); ev.setSizeHint(sz);
} }
@ -100,7 +119,7 @@ private:
gfx::Point(rc.x+2*guiscale(), gfx::Point(rc.x+2*guiscale(),
rc.y+2*guiscale())); rc.y+2*guiscale()));
g->drawRgbaSurface( g->drawRgbaSurface(
m_preview, preview(),
rc.x+2*guiscale(), rc.x+2*guiscale(),
rc.y+4*guiscale()+textsz.h); rc.y+4*guiscale()+textsz.h);
} }
@ -108,6 +127,8 @@ private:
render::DitheringAlgorithm m_algo; render::DitheringAlgorithm m_algo;
render::DitheringMatrix m_matrix; render::DitheringMatrix m_matrix;
she::Surface* m_preview; she::Surface* m_preview;
doc::ObjectId m_palId;
int m_palMods;
}; };
} // anonymous namespace } // anonymous namespace