From 2995190d00e2d067b4f2a78d59805f1b62cde805 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 8 May 2015 17:00:44 -0300
Subject: [PATCH] Fix crash making palette entries too small using scroll wheel

---
 src/app/ui/color_bar.cpp    | 2 +-
 src/app/ui/palette_view.cpp | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp
index 6b8872f48..7d82fa5e3 100644
--- a/src/app/ui/color_bar.cpp
+++ b/src/app/ui/color_bar.cpp
@@ -388,7 +388,7 @@ void ColorBar::setPalette(const doc::Palette* newPalette, const std::string& act
 
 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)
diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp
index e30479952..798ad37a8 100644
--- a/src/app/ui/palette_view.cpp
+++ b/src/app/ui/palette_view.cpp
@@ -179,15 +179,13 @@ int PaletteView::getBoxSize() const
 void PaletteView::setBoxSize(int boxsize)
 {
   m_boxsize = MID(4*guiscale(), boxsize, 32*guiscale());
-  m_boxsize = boxsize * guiscale();
 
   if (m_delegate)
-    m_delegate->onPaletteViewChangeSize(m_boxsize);
+    m_delegate->onPaletteViewChangeSize(m_boxsize / guiscale());
 
   View* view = View::getView(this);
   if (view)
     view->layout();
-
 }
 
 bool PaletteView::onProcessMessage(Message* msg)
@@ -265,7 +263,7 @@ bool PaletteView::onProcessMessage(Message* msg)
 
       if (msg->onlyCtrlPressed()) {
         int z = delta.x - delta.y;
-        setBoxSize(m_boxsize + z * guiscale());
+        setBoxSize(m_boxsize / guiscale() + z);
       }
       else {
         gfx::Point scroll = view->getViewScroll();