Move ContextBar::ShadeWidget to ColorShades class

src/app/CMakeLists.txt

@@ -449,6 +449,7 @@ add_library(app-lib
   ui/color_button.cpp
   ui/color_popup.cpp
   ui/color_selector.cpp
+  ui/color_shades.cpp
   ui/color_sliders.cpp
   ui/color_spectrum.cpp
   ui/color_tint_shade_tone.cpp

src/app/ui/color_shades.cpp

@@ -0,0 +1,318 @@
+// Aseprite
+// Copyright (C) 2018  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/ui/color_shades.h"
+
+#include "app/app.h"
+#include "app/modules/gfx.h"
+#include "app/modules/palettes.h"
+#include "app/shade.h"
+#include "app/ui/color_bar.h"
+#include "app/ui/skin/skin_theme.h"
+#include "base/bind.h"
+#include "base/unique_ptr.h"
+#include "doc/color_mode.h"
+#include "doc/palette.h"
+#include "doc/palette_picks.h"
+#include "doc/remap.h"
+#include "ui/graphics.h"
+#include "ui/message.h"
+#include "ui/paint_event.h"
+#include "ui/size_hint_event.h"
+#include "ui/system.h"
+
+namespace app {
+
+ColorShades::ColorShades(const Shade& colors, ClickType click)
+  : Widget(ui::kGenericWidget)
+  , m_click(click)
+  , m_shade(colors)
+  , m_hotIndex(-1)
+  , m_dragIndex(-1)
+  , m_boxSize(12)
+{
+  setText("Select colors in the palette");
+  initTheme();
+}
+
+void ColorShades::reverseShadeColors()
+{
+  std::reverse(m_shade.begin(), m_shade.end());
+  invalidate();
+}
+
+doc::Remap* ColorShades::createShadeRemap(bool left)
+{
+  base::UniquePtr<doc::Remap> remap;
+  Shade colors = getShade();
+
+  // We need two or more colors to create a shading remap. In
+  // other case, the ShadingInkProcessing will use the full
+  // color palette.
+  if (colors.size() > 1) {
+    remap.reset(new doc::Remap(get_current_palette()->size()));
+
+    for (int i=0; i<remap->size(); ++i)
+      remap->map(i, i);
+
+    if (left) {
+      for (int i=1; i<int(colors.size()); ++i)
+        remap->map(colors[i].getIndex(), colors[i-1].getIndex());
+    }
+    else {
+      for (int i=0; i<int(colors.size())-1; ++i)
+        remap->map(colors[i].getIndex(), colors[i+1].getIndex());
+    }
+  }
+
+  return remap.release();
+}
+
+int ColorShades::size() const
+{
+  int colors = 0;
+  for (const auto& color : m_shade) {
+    if ((color.getIndex() >= 0 &&
+         color.getIndex() < get_current_palette()->size()) ||
+        (m_click == Select)) {
+      ++colors;
+    }
+  }
+  return colors;
+}
+
+Shade ColorShades::getShade() const
+{
+  Shade colors;
+  for (const auto& color : m_shade) {
+    if ((color.getIndex() >= 0 &&
+         color.getIndex() < get_current_palette()->size()) ||
+        (m_click == Select)) {
+      colors.push_back(color);
+    }
+  }
+  return colors;
+}
+
+void ColorShades::setShade(const Shade& shade)
+{
+  m_shade = shade;
+  invalidate();
+  parent()->parent()->layout();
+}
+
+void ColorShades::updateShadeFromColorBarPicks()
+{
+  auto colorBar = ColorBar::instance();
+  if (!colorBar)
+    return;
+
+  doc::PalettePicks picks;
+  colorBar->getPaletteView()->getSelectedEntries(picks);
+  if (picks.picks() >= 2)
+    onChangeColorBarSelection();
+}
+
+void ColorShades::onInitTheme(ui::InitThemeEvent& ev)
+{
+  Widget::onInitTheme(ev);
+  setStyle(skin::SkinTheme::instance()->styles.menuShadeView());
+}
+
+bool ColorShades::onProcessMessage(ui::Message* msg)
+{
+  switch (msg->type()) {
+
+    case ui::kOpenMessage:
+      if (m_click == DragAndDrop) {
+        m_conn = ColorBar::instance()->ChangeSelection.connect(
+          base::Bind<void>(&ColorShades::onChangeColorBarSelection, this));
+      }
+      break;
+
+    case ui::kSetCursorMessage:
+      if (hasCapture()) {
+        ui::set_mouse_cursor(ui::kMoveCursor);
+        return true;
+      }
+      break;
+
+    case ui::kMouseEnterMessage:
+    case ui::kMouseLeaveMessage:
+      invalidate();
+      break;
+
+    case ui::kMouseDownMessage: {
+      if (m_click == DragAndDrop) {
+        if (m_hotIndex >= 0 &&
+            m_hotIndex < int(m_shade.size())) {
+          m_dragIndex = m_hotIndex;
+          m_dropBefore = false;
+          captureMouse();
+        }
+      }
+      break;
+    }
+
+    case ui::kMouseUpMessage: {
+      if (m_click == Select) {
+        setSelected(true);
+        Click();
+        closeWindow();
+      }
+
+      if (m_dragIndex >= 0) {
+        ASSERT(m_dragIndex < int(m_shade.size()));
+
+        auto color = m_shade[m_dragIndex];
+        m_shade.erase(m_shade.begin()+m_dragIndex);
+        if (m_hotIndex >= 0)
+          m_shade.insert(m_shade.begin()+m_hotIndex, color);
+
+        m_dragIndex = -1;
+        invalidate();
+
+        // Relayout the context bar if we have removed an entry.
+        if (m_hotIndex < 0)
+          parent()->parent()->layout();
+      }
+
+      if (hasCapture())
+        releaseMouse();
+      break;
+    }
+
+    case ui::kMouseMoveMessage: {
+      ui::MouseMessage* mouseMsg = static_cast<ui::MouseMessage*>(msg);
+      gfx::Point mousePos = mouseMsg->position() - bounds().origin();
+      gfx::Rect bounds = clientBounds();
+      int hot = -1;
+
+      bounds.shrink(3*ui::guiscale());
+
+      if (bounds.contains(mousePos)) {
+        int count = size();
+        hot = (mousePos.x - bounds.x) / (m_boxSize*ui::guiscale());
+        hot = MID(0, hot, count-1);
+      }
+
+      if (m_hotIndex != hot) {
+        m_hotIndex = hot;
+        invalidate();
+      }
+
+      bool dropBefore =
+        (hot >= 0 && mousePos.x < (bounds.x+m_boxSize*ui::guiscale()*hot)+m_boxSize*ui::guiscale()/2);
+      if (m_dropBefore != dropBefore) {
+        m_dropBefore = dropBefore;
+        invalidate();
+      }
+      break;
+    }
+  }
+  return Widget::onProcessMessage(msg);
+}
+
+void ColorShades::onSizeHint(ui::SizeHintEvent& ev)
+{
+  int size = this->size();
+  if (size < 2)
+    ev.setSizeHint(gfx::Size((16+m_boxSize)*ui::guiscale()+textWidth(), 18*ui::guiscale()));
+  else {
+    if (m_click == Select && size > 16)
+      size = 16;
+    ev.setSizeHint(gfx::Size(6+m_boxSize*size, 18)*ui::guiscale());
+  }
+}
+
+void ColorShades::onPaint(ui::PaintEvent& ev)
+{
+  auto theme = skin::SkinTheme::instance();
+  ui::Graphics* g = ev.graphics();
+  gfx::Rect bounds = clientBounds();
+
+  theme->paintWidget(g, this, style(), bounds);
+
+  bounds.shrink(3*ui::guiscale());
+
+  gfx::Rect box(bounds.x, bounds.y, m_boxSize*ui::guiscale(), bounds.h);
+
+  Shade colors = getShade();
+  if (colors.size() >= 2) {
+    gfx::Rect hotBounds;
+
+    int j = 0;
+    for (int i=0; box.x<bounds.x2(); ++i, box.x += box.w) {
+      // Make the last box a little bigger to just use all
+      // available size
+      if (i == int(colors.size())-1) {
+        if (bounds.x+bounds.w-box.x <= m_boxSize+m_boxSize/2)
+          box.w = bounds.x+bounds.w-box.x;
+      }
+
+      app::Color color;
+
+      if (m_dragIndex >= 0 &&
+          m_hotIndex == i) {
+        color = colors[m_dragIndex];
+      }
+      else {
+        if (j == m_dragIndex) {
+          ++j;
+        }
+        if (j < int(colors.size()))
+          color = colors[j++];
+        else
+          color = app::Color::fromMask();
+      }
+
+      draw_color(g, box, color,
+                 (doc::ColorMode)app_get_current_pixel_format());
+
+      if (m_hotIndex == i)
+        hotBounds = box;
+    }
+
+    if (!hotBounds.isEmpty() && m_click == DragAndDrop) {
+      hotBounds.enlarge(3*ui::guiscale());
+
+      ui::PaintWidgetPartInfo info;
+      theme->paintWidgetPart(
+        g, theme->styles.shadeSelection(), hotBounds, info);
+    }
+  }
+  else {
+    g->fillRect(theme->colors.editorFace(), bounds);
+    g->drawAlignedUIText(text(), theme->colors.face(), gfx::ColorNone, bounds,
+                         ui::CENTER | ui::MIDDLE);
+  }
+}
+
+void ColorShades::onChangeColorBarSelection()
+{
+  if (!isVisible())
+    return;
+
+  doc::PalettePicks picks;
+  ColorBar::instance()->getPaletteView()->getSelectedEntries(picks);
+
+  m_shade.resize(picks.picks());
+
+  int i = 0, j = 0;
+  for (bool pick : picks) {
+    if (pick)
+      m_shade[j++] = app::Color::fromIndex(i);
+    ++i;
+  }
+
+  parent()->parent()->layout();
+}
+
+} // namespace app

src/app/ui/color_shades.h

@@ -0,0 +1,56 @@
+// Aseprite
+// Copyright (C) 2018  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_COLOR_SHADES_H_INCLUDED
+#define APP_UI_COLOR_SHADES_H_INCLUDED
+#pragma once
+
+#include "app/shade.h"
+#include "obs/signal.h"
+#include "ui/widget.h"
+
+namespace doc {
+  class Remap;
+}
+
+namespace app {
+
+  class ColorShades : public ui::Widget {
+  public:
+    enum ClickType { DragAndDrop, Select };
+
+    ColorShades(const Shade& colors, ClickType click);
+
+    void reverseShadeColors();
+    doc::Remap* createShadeRemap(bool left);
+    int size() const;
+
+    Shade getShade() const;
+    void setShade(const Shade& shade);
+
+    void updateShadeFromColorBarPicks();
+
+    obs::signal<void()> Click;
+
+  private:
+    void onInitTheme(ui::InitThemeEvent& ev) override;
+    bool onProcessMessage(ui::Message* msg) override;
+    void onSizeHint(ui::SizeHintEvent& ev) override;
+    void onPaint(ui::PaintEvent& ev) override;
+    void onChangeColorBarSelection();
+
+    ClickType m_click;
+    Shade m_shade;
+    int m_hotIndex;
+    int m_dragIndex;
+    bool m_dropBefore;
+    int m_boxSize;
+    obs::scoped_connection m_conn;
+  };
+
+} // namespace app
+
+#endif

src/app/ui/context_bar.cpp

@@ -18,8 +18,6 @@
 #include "app/commands/quick_command.h"
 #include "app/document.h"
 #include "app/ini_file.h"
-#include "app/modules/gfx.h"
-#include "app/modules/palettes.h"
 #include "app/pref/preferences.h"
 #include "app/shade.h"
 #include "app/tools/active_tool.h"
@@ -33,6 +31,7 @@
 #include "app/ui/brush_popup.h"
 #include "app/ui/button_set.h"
 #include "app/ui/color_button.h"
+#include "app/ui/color_shades.h"
 #include "app/ui/dithering_selector.h"
 #include "app/ui/icon_button.h"
 #include "app/ui/keyboard_shortcuts.h"
@@ -460,300 +459,10 @@ protected:
 
 class ContextBar::InkShadesField : public HBox {
 
-  class ShadeWidget : public Widget {
-  public:
-    enum ClickType { DragAndDrop, Select };
-
-    obs::signal<void()> Click;
-
-    ShadeWidget(const Shade& colors, ClickType click)
-      : Widget(kGenericWidget)
-      , m_click(click)
-      , m_shade(colors)
-      , m_hotIndex(-1)
-      , m_dragIndex(-1)
-      , m_boxSize(12) {
-      setText("Select colors in the palette");
-      initTheme();
-    }
-
-    void reverseShadeColors() {
-      std::reverse(m_shade.begin(), m_shade.end());
-      invalidate();
-    }
-
-    doc::Remap* createShadeRemap(bool left) {
-      base::UniquePtr<doc::Remap> remap;
-      Shade colors = getShade();
-
-      // We need two or more colors to create a shading remap. In
-      // other case, the ShadingInkProcessing will use the full
-      // color palette.
-      if (colors.size() > 1) {
-        remap.reset(new doc::Remap(get_current_palette()->size()));
-
-        for (int i=0; i<remap->size(); ++i)
-          remap->map(i, i);
-
-        if (left) {
-          for (int i=1; i<int(colors.size()); ++i)
-            remap->map(colors[i].getIndex(), colors[i-1].getIndex());
-        }
-        else {
-          for (int i=0; i<int(colors.size())-1; ++i)
-            remap->map(colors[i].getIndex(), colors[i+1].getIndex());
-        }
-      }
-
-      return remap.release();
-    }
-
-    int size() const {
-      int colors = 0;
-      for (const auto& color : m_shade) {
-        if ((color.getIndex() >= 0 &&
-             color.getIndex() < get_current_palette()->size()) ||
-            (m_click == Select)) {
-          ++colors;
-        }
-      }
-      return colors;
-    }
-
-    Shade getShade() const {
-      Shade colors;
-      for (const auto& color : m_shade) {
-        if ((color.getIndex() >= 0 &&
-             color.getIndex() < get_current_palette()->size()) ||
-            (m_click == Select)) {
-          colors.push_back(color);
-        }
-      }
-      return colors;
-    }
-
-    void setShade(const Shade& shade) {
-      m_shade = shade;
-      invalidate();
-      parent()->parent()->layout();
-    }
-
-    void updateShadeFromColorBarPicks() {
-      auto colorBar = ColorBar::instance();
-      if (!colorBar)
-        return;
-
-      doc::PalettePicks picks;
-      colorBar->getPaletteView()->getSelectedEntries(picks);
-      if (picks.picks() >= 2)
-        onChangeColorBarSelection();
-    }
-
-  private:
-
-    void onInitTheme(InitThemeEvent& ev) override {
-      Widget::onInitTheme(ev);
-      setStyle(SkinTheme::instance()->styles.menuShadeView());
-    }
-
-    void onChangeColorBarSelection() {
-      if (!isVisible())
-        return;
-
-      doc::PalettePicks picks;
-      ColorBar::instance()->getPaletteView()->getSelectedEntries(picks);
-
-      m_shade.resize(picks.picks());
-
-      int i = 0, j = 0;
-      for (bool pick : picks) {
-        if (pick)
-          m_shade[j++] = app::Color::fromIndex(i);
-        ++i;
-      }
-
-      parent()->parent()->layout();
-    }
-
-    bool onProcessMessage(ui::Message* msg) override {
-      switch (msg->type()) {
-
-        case kOpenMessage:
-          if (m_click == DragAndDrop) {
-            m_conn = ColorBar::instance()->ChangeSelection.connect(
-              base::Bind<void>(&ShadeWidget::onChangeColorBarSelection, this));
-          }
-          break;
-
-        case kSetCursorMessage:
-          if (hasCapture()) {
-            ui::set_mouse_cursor(kMoveCursor);
-            return true;
-          }
-          break;
-
-        case kMouseEnterMessage:
-        case kMouseLeaveMessage:
-          invalidate();
-          break;
-
-        case kMouseDownMessage: {
-          if (m_click == DragAndDrop) {
-            if (m_hotIndex >= 0 &&
-                m_hotIndex < int(m_shade.size())) {
-              m_dragIndex = m_hotIndex;
-              m_dropBefore = false;
-              captureMouse();
-            }
-          }
-          break;
-        }
-
-        case kMouseUpMessage: {
-          if (m_click == Select) {
-            setSelected(true);
-            Click();
-            closeWindow();
-          }
-
-          if (m_dragIndex >= 0) {
-            ASSERT(m_dragIndex < int(m_shade.size()));
-
-            auto color = m_shade[m_dragIndex];
-            m_shade.erase(m_shade.begin()+m_dragIndex);
-            if (m_hotIndex >= 0)
-              m_shade.insert(m_shade.begin()+m_hotIndex, color);
-
-            m_dragIndex = -1;
-            invalidate();
-
-            // Relayout the context bar if we have removed an entry.
-            if (m_hotIndex < 0)
-              parent()->parent()->layout();
-          }
-
-          if (hasCapture())
-            releaseMouse();
-          break;
-        }
-
-        case kMouseMoveMessage: {
-          MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
-          gfx::Point mousePos = mouseMsg->position() - bounds().origin();
-          gfx::Rect bounds = clientBounds();
-          int hot = -1;
-
-          bounds.shrink(3*guiscale());
-
-          if (bounds.contains(mousePos)) {
-            int count = size();
-            hot = (mousePos.x - bounds.x) / (m_boxSize*guiscale());
-            hot = MID(0, hot, count-1);
-          }
-
-          if (m_hotIndex != hot) {
-            m_hotIndex = hot;
-            invalidate();
-          }
-
-          bool dropBefore =
-            (hot >= 0 && mousePos.x < (bounds.x+m_boxSize*guiscale()*hot)+m_boxSize*guiscale()/2);
-          if (m_dropBefore != dropBefore) {
-            m_dropBefore = dropBefore;
-            invalidate();
-          }
-          break;
-        }
-      }
-      return Widget::onProcessMessage(msg);
-    }
-
-    void onSizeHint(SizeHintEvent& ev) override {
-      int size = this->size();
-      if (size < 2)
-        ev.setSizeHint(Size((16+m_boxSize)*guiscale()+textWidth(), 18*guiscale()));
-      else {
-        if (m_click == Select && size > 16)
-          size = 16;
-        ev.setSizeHint(Size(6+m_boxSize*size, 18)*guiscale());
-      }
-    }
-
-    void onPaint(PaintEvent& ev) override {
-      SkinTheme* theme = SkinTheme::instance();
-      Graphics* g = ev.graphics();
-      gfx::Rect bounds = clientBounds();
-
-      theme->paintWidget(g, this, style(), bounds);
-
-      bounds.shrink(3*guiscale());
-
-      gfx::Rect box(bounds.x, bounds.y, m_boxSize*guiscale(), bounds.h);
-
-      Shade colors = getShade();
-      if (colors.size() >= 2) {
-        gfx::Rect hotBounds;
-
-        int j = 0;
-        for (int i=0; box.x<bounds.x2(); ++i, box.x += box.w) {
-          // Make the last box a little bigger to just use all
-          // available size
-          if (i == int(colors.size())-1) {
-            if (bounds.x+bounds.w-box.x <= m_boxSize+m_boxSize/2)
-              box.w = bounds.x+bounds.w-box.x;
-          }
-
-          app::Color color;
-
-          if (m_dragIndex >= 0 &&
-              m_hotIndex == i) {
-            color = colors[m_dragIndex];
-          }
-          else {
-            if (j == m_dragIndex) {
-              ++j;
-            }
-            if (j < int(colors.size()))
-              color = colors[j++];
-            else
-              color = app::Color::fromMask();
-          }
-
-          draw_color(g, box, color,
-                     (doc::ColorMode)app_get_current_pixel_format());
-
-          if (m_hotIndex == i)
-            hotBounds = box;
-        }
-
-        if (!hotBounds.isEmpty() && m_click == DragAndDrop) {
-          hotBounds.enlarge(3*guiscale());
-
-          PaintWidgetPartInfo info;
-          theme->paintWidgetPart(
-            g, theme->styles.shadeSelection(), hotBounds, info);
-        }
-      }
-      else {
-        g->fillRect(theme->colors.editorFace(), bounds);
-        g->drawAlignedUIText(text(), theme->colors.face(), gfx::ColorNone, bounds,
-                             ui::CENTER | ui::MIDDLE);
-      }
-    }
-
-    ClickType m_click;
-    Shade m_shade;
-    int m_hotIndex;
-    int m_dragIndex;
-    bool m_dropBefore;
-    int m_boxSize;
-    obs::scoped_connection m_conn;
-  };
-
 public:
   InkShadesField()
     : m_button(SkinTheme::instance()->parts.iconArrowDown())
-    , m_shade(Shade(), ShadeWidget::DragAndDrop)
+    , m_shade(Shade(), ColorShades::DragAndDrop)
     , m_loaded(false) {
     addChild(&m_button);
     addChild(&m_shade);
@@ -821,7 +530,7 @@ private:
 
       int i = 0;
       for (const Shade& shade : m_shades) {
-        auto shadeWidget = new ShadeWidget(shade, ShadeWidget::Select);
+        auto shadeWidget = new ColorShades(shade, ColorShades::Select);
         shadeWidget->setExpansive(true);
         shadeWidget->Click.connect(
           [&]{
@@ -895,7 +604,7 @@ private:
   }
 
   IconButton m_button;
-  ShadeWidget m_shade;
+  ColorShades m_shade;
   std::vector<Shade> m_shades;
   bool m_loaded;
 };