From 60a3da7b7c233406d7ffb86af21502bea5001889 Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 29 Jun 2015 12:33:41 -0300 Subject: [PATCH] Fix PaletteView::setColumns() to set a correct number of columns for small palettes If we have a palette with few colors (e.g. just one row of colors), we would like to setup a columns number equal to the whole available PaletteView width. This is because when we drag colors, we can drop them in position that are outside the current palette size. --- src/app/ui/palette_view.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/ui/palette_view.cpp b/src/app/ui/palette_view.cpp index 89d880227..59580ac58 100644 --- a/src/app/ui/palette_view.cpp +++ b/src/app/ui/palette_view.cpp @@ -80,8 +80,6 @@ PaletteView::PaletteView(bool editable, PaletteViewStyle style, PaletteViewDeleg void PaletteView::setColumns(int columns) { int old_columns = m_columns; - - ASSERT(columns >= 1 && columns <= currentPalette()->size()); m_columns = columns; if (m_columns != old_columns) { @@ -529,7 +527,7 @@ void PaletteView::onResize(ui::ResizeEvent& ev) int columns = (view->getViewportBounds().w-this->childSpacing()*2) / (m_boxsize+this->childSpacing()); - setColumns(MID(1, columns, currentPalette()->size())); + setColumns(MAX(1, columns)); } m_isUpdatingColumns = false; }