mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when the palette editor is slowly resized to its minimum size (fix #949)

Browse Source 
It was caused by a division by zero.
This commit is contained in:
David Capello 2016-01-31 19:57:33 -03:00
parent 81d39664a7
commit 3a79cf5559
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/ui/color_sliders.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -46,28 +46,30 @@ namespace {
void paint(Slider* slider, Graphics* g, const gfx::Rect& rc) {
gfx::Color color = gfx::ColorNone;
for (int x=0; x < rc.w; ++x) {
int w = MAX(rc.w-1, 1);
for (int x=0; x <= w; ++x) {
switch (m_channel) {
case ColorSliders::Red:
color = gfx::rgba(255 * x / (rc.w-1), m_color.getGreen(), m_color.getBlue());
color = gfx::rgba(255 * x / w, m_color.getGreen(), m_color.getBlue());
break;
case ColorSliders::Green:
color = gfx::rgba(m_color.getRed(), 255 * x / (rc.w-1), m_color.getBlue());
color = gfx::rgba(m_color.getRed(), 255 * x / w, m_color.getBlue());
break;
case ColorSliders::Blue:
color = gfx::rgba(m_color.getRed(), m_color.getGreen(), 255 * x / (rc.w-1));
color = gfx::rgba(m_color.getRed(), m_color.getGreen(), 255 * x / w);
break;
case ColorSliders::Hue:
color = color_utils::color_for_ui(app::Color::fromHsv(360 * x / (rc.w-1), m_color.getSaturation(), m_color.getValue()));
color = color_utils::color_for_ui(app::Color::fromHsv(360 * x / w, m_color.getSaturation(), m_color.getValue()));
break;
case ColorSliders::Saturation:
color = color_utils::color_for_ui(app::Color::fromHsv(m_color.getHue(), 100 * x / (rc.w-1), m_color.getValue()));
color = color_utils::color_for_ui(app::Color::fromHsv(m_color.getHue(), 100 * x / w, m_color.getValue()));
break;
case ColorSliders::Value:
color = color_utils::color_for_ui(app::Color::fromHsv(m_color.getHue(), m_color.getSaturation(), 100 * x / (rc.w-1)));
color = color_utils::color_for_ui(app::Color::fromHsv(m_color.getHue(), m_color.getSaturation(), 100 * x / w));
break;
case ColorSliders::Gray:
color = color_utils::color_for_ui(app::Color::fromGray(255 * x / (rc.w-1)));
color = color_utils::color_for_ui(app::Color::fromGray(255 * x / w));
break;
}
g->drawVLine(color, rc.x+x, rc.y, rc.h);