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

Fix crash making palette entries too small using scroll wheel

Browse Source
This commit is contained in:
David Capello 2015-05-08 17:00:44 -03:00
parent ca1ebf02b5
commit 2995190d00
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/ui/color_bar.cpp
View File

@ -388,7 +388,7 @@ void ColorBar::setPalette(const doc::Palette* newPalette, const std::string& act
void ColorBar::onPaletteViewChangeSize(int boxsize) void ColorBar::onPaletteViewChangeSize(int boxsize)
{ {
App::instance()->preferences().colorBar.boxSize(boxsize / guiscale()); App::instance()->preferences().colorBar.boxSize(boxsize);
} }
void ColorBar::onFgColorButtonChange(const app::Color& color) void ColorBar::onFgColorButtonChange(const app::Color& color)

6
src/app/ui/palette_view.cpp
View File

@ -179,15 +179,13 @@ int PaletteView::getBoxSize() const
void PaletteView::setBoxSize(int boxsize) void PaletteView::setBoxSize(int boxsize)
{ {
m_boxsize = MID(4*guiscale(), boxsize, 32*guiscale()); m_boxsize = MID(4*guiscale(), boxsize, 32*guiscale());
m_boxsize = boxsize * guiscale();
if (m_delegate) if (m_delegate)
m_delegate->onPaletteViewChangeSize(m_boxsize); m_delegate->onPaletteViewChangeSize(m_boxsize / guiscale());
View* view = View::getView(this); View* view = View::getView(this);
if (view) if (view)
view->layout(); view->layout();
} }
bool PaletteView::onProcessMessage(Message* msg) bool PaletteView::onProcessMessage(Message* msg)
@ -265,7 +263,7 @@ bool PaletteView::onProcessMessage(Message* msg)
if (msg->onlyCtrlPressed()) { if (msg->onlyCtrlPressed()) {
int z = delta.x - delta.y; int z = delta.x - delta.y;
setBoxSize(m_boxsize + z * guiscale()); setBoxSize(m_boxsize / guiscale() + z);
} }
else { else {
gfx::Point scroll = view->getViewScroll(); gfx::Point scroll = view->getViewScroll();