Themed checkboxes

Slightly larger items in (multiple) choice viewers

src/gui/value/choice.cpp

@@ -14,10 +14,13 @@
 #include <script/image.hpp>
 #include <wx/imaglist.h>
 
+const int thumbnail_size = 18;
+const double min_item_size = thumbnail_size;
+
 // ----------------------------------------------------------------------------- : ChoiceThumbnailRequest
 
 class ChoiceThumbnailRequest : public ThumbnailRequest {
-  public:
+public:
   ChoiceThumbnailRequest(ValueViewer* cve, int id, bool from_disk, bool thread_safe);
   virtual Image generate();
   virtual void store(const Image&);
@@ -47,44 +50,16 @@ Image ChoiceThumbnailRequest::generate() {
   String name = canonical_name_form(s.field().choices->choiceName(id));
   ScriptableImage& img = s.choice_images[name];
   return img.isReady()
-    ? img.generate(GeneratedImage::Options(16,16, &viewer().getStylePackage(), &viewer().getLocalPackage(), ASPECT_BORDER, true))
+    ? img.generate(GeneratedImage::Options(thumbnail_size, thumbnail_size, &viewer().getStylePackage(), &viewer().getLocalPackage(), ASPECT_BORDER, true))
     : wxImage();
 }
 
 void ChoiceThumbnailRequest::store(const Image& img) {
-  ChoiceStyle& s = style();
-  wxImageList* il = s.thumbnails;
-  while (id > il->GetImageCount()) {
-    il->Add(wxBitmap(16,16),*wxBLACK);
-  }
   if (img.Ok()) {
-    #ifdef __WXMSW__
-      // for some reason windows doesn't like completely transparent images if they do not have a mask
-      // HACK:
-      if (img.HasAlpha() && img.GetWidth() == 16 && img.GetHeight() == 16) {
-        // is the image empty?
-        bool empty = true;
-        int* b = (int*)img.GetAlpha();
-        int* e = b + 16*16/sizeof(int);
-        while (b != e) {
-          if (*b++) {
-            empty = false;
-            break;
-          }
-        }
-        // if so, use a mask instead
-        if (empty) {
-          const_cast<Image&>(img).ConvertAlphaToMask();
-        }
-      }
-      // Hack ends here
-    #endif
-    if (id == il->GetImageCount()) {
-      il->Add(img);
-    } else {
-      il->Replace(id, img);
-    }
-    s.thumbnails_status[id] = THUMB_OK;
+    ChoiceThumbnail& thumbnail = style().thumbnails[id];
+    ChoiceThumbnailLock lock(thumbnail.mutex);
+    thumbnail.bitmap = img;
+    thumbnail.status = THUMB_OK;
   }
 }
 
@@ -96,9 +71,9 @@ DropDownChoiceListBase::DropDownChoiceListBase
   , cve(cve)
   , group(group)
 {
-  icon_size.width  = 16;
-  icon_size.height = 16;
-  item_size.height = max(16., item_size.height);
+  icon_size.width  = min_item_size;
+  icon_size.height = min_item_size;
+  item_size.height = max(min_item_size, item_size.height);
 }
 
 void DropDownChoiceListBase::onShow() {
@@ -151,9 +126,6 @@ DropDownList* DropDownChoiceListBase::submenu(size_t item) const {
 }
 
 void DropDownChoiceListBase::drawIcon(DC& dc, int x, int y, size_t item, bool selected) const {
-  // imagelist to use
-  wxImageList* il = style().thumbnails;
-  assert(il);
   // find the image for the item
   int image_id;
   if (isFieldDefault(item)) {
@@ -162,22 +134,21 @@ void DropDownChoiceListBase::drawIcon(DC& dc, int x, int y, size_t item, bool se
     image_id = getChoice(item)->first_id;
   }
   // draw image
-  if (image_id < il->GetImageCount()) {
-    il->Draw(image_id, dc, x, y, itemEnabled(item) ? wxIMAGELIST_DRAW_NORMAL : wxIMAGELIST_DRAW_TRANSPARENT);
+  if (image_id < style().thumbnails.size()) {
+    auto const& thumbnail = style().thumbnails[image_id];
+    if (thumbnail.status == THUMB_OK)
+    dc.DrawBitmap(thumbnail.bitmap, x, y);
+    //il->Draw(image_id, dc, x, y, itemEnabled(item) ? wxIMAGELIST_DRAW_NORMAL : wxIMAGELIST_DRAW_TRANSPARENT);
   }
 }
 
 void DropDownChoiceListBase::generateThumbnailImages() {
   if (!isRoot()) return;
-  if (!style().thumbnails) {
-    style().thumbnails = new wxImageList(16,16);
-  }
-  int image_count = style().thumbnails->GetImageCount();
-  int end = group->lastId();
   // init choice images
   Context& ctx = cve.viewer.getContext();
   if (style().choice_images.empty() && style().image.isScripted()) {
-    for (int i = 0 ; i < end ; ++i) {
+    int n = field().choices->lastId();
+    for (int i = 0 ; i < n; ++i) {
       try {
         String name = canonical_name_form(field().choices->choiceName(i));
         ctx.setVariable(_("input"), to_script(name));
@@ -188,21 +159,26 @@ void DropDownChoiceListBase::generateThumbnailImages() {
       }
     }
   }
+  // init thumbnail vector
+  if (style().thumbnails.empty()) {
+    style().thumbnails.resize(field().choices->lastId());
+  }
+  assert(style().thumbnails.size() == field().choices->lastId());
   // request thumbnails
-  style().thumbnails_status.resize(end, THUMB_NOT_MADE);
-  for (int i = 0 ; i < end ; ++i) {
-    ThumbnailStatus& status = style().thumbnails_status[i];
-    if (i >= image_count || status != THUMB_OK) {
+  int end = group->lastId();
+  for (int i = group->first_id ; i < end ; ++i) {
+    auto& thumbnail = style().thumbnails[i];
+    ChoiceThumbnailLock lock(thumbnail.mutex);
+    if (thumbnail.status != THUMB_OK) {
       // update image
-      ChoiceStyle& s = style();
-      String name = canonical_name_form(s.field().choices->choiceName(i));
-      ScriptableImage& img = s.choice_images[name];
-      if (!img.update(ctx) && status == THUMB_CHANGED) {
-        status = THUMB_OK; // no need to rebuild
+      String name = canonical_name_form(field().choices->choiceName(i));
+      ScriptableImage& img = style().choice_images[name];
+      if (!img.update(ctx) && thumbnail.status == THUMB_CHANGED) {
+        thumbnail.status = THUMB_OK; // no need to rebuild
       } else if (img.isReady()) {
         // request this thumbnail
         thumbnail_thread.request(make_intrusive<ChoiceThumbnailRequest>(
-            &cve, i, status == THUMB_NOT_MADE && !img.local(), img.threadSafe()
+            &cve, i, thumbnail.status == THUMB_NOT_MADE && !img.local(), img.threadSafe()
           ));
       }
     }

src/gui/value/choice.hpp

@@ -44,22 +44,22 @@ class ChoiceValueEditor : public ChoiceValueViewer, public ValueEditor {
 /// A drop down list of choices
 /** This is a base class, used for single and multiple choice fields */
 class DropDownChoiceListBase : public DropDownList {
-  public:
+public:
   DropDownChoiceListBase(Window* parent, bool is_submenu, ValueViewer& cve, ChoiceField::ChoiceP group);
   
-  protected:
-  virtual void          onShow();
-  virtual size_t        itemCount() const;
-  virtual bool          lineBelow(size_t item) const;
-  virtual bool          itemEnabled(size_t item) const;
-  virtual String        itemText(size_t item) const;
-  virtual void          drawIcon(DC& dc, int x, int y, size_t item, bool selected) const;
-  virtual DropDownList* submenu(size_t item) const;
+protected:
+  void          onShow() override;
+  size_t        itemCount() const override;
+  bool          lineBelow(size_t item) const override;
+  bool          itemEnabled(size_t item) const override;
+  String        itemText(size_t item) const override;
+  void          drawIcon(DC& dc, int x, int y, size_t item, bool selected) const override;
+  DropDownList* submenu(size_t item) const override;
   
-  protected:
+protected:
   virtual DropDownList* createSubMenu(ChoiceField::ChoiceP group) const = 0;
   
-  private:
+private:
   DECLARE_EVENT_TABLE();
   
   ValueViewer& cve;        ///< Editor this list belongs to

src/gui/value/multiple_choice.cpp

@@ -16,23 +16,23 @@
 
 /// A drop down list of color choices
 class DropDownMultipleChoiceList : public DropDownChoiceListBase {
-  public:
+public:
   DropDownMultipleChoiceList(Window* parent, bool is_submenu, ValueViewer& cve, ChoiceField::ChoiceP group);
   
-  protected:
-  virtual void   onShow();
-  virtual void   select(size_t item);
-  virtual size_t selection() const;
-  virtual bool stayOpen(size_t selection) const { return true; }
-  virtual DropDownList* createSubMenu(ChoiceField::ChoiceP group) const;
-  virtual void drawIcon(DC& dc, int x, int y, size_t item, bool selected) const;
+protected:
+  void onShow() override;
+  void select(size_t item) override;
+  size_t selection() const override;
+  bool stayOpen(size_t selection) const override { return true; }
+  DropDownList* createSubMenu(ChoiceField::ChoiceP group) const override;
+  void drawIcon(DC& dc, int x, int y, size_t item, bool selected) const override;
 };
 
 DropDownMultipleChoiceList::DropDownMultipleChoiceList
     (Window* parent, bool is_submenu, ValueViewer& cve, ChoiceField::ChoiceP group)
   : DropDownChoiceListBase(parent, is_submenu, cve, group)
 {
-  icon_size.width += 16;
+  icon_size.width += icon_size.height; // make room for checkbox
 }
 
 void DropDownMultipleChoiceList::select(size_t item) {
@@ -59,17 +59,15 @@ void DropDownMultipleChoiceList::drawIcon(DC& dc, int x, int y, size_t item, boo
     active = dynamic_cast<MultipleChoiceValueEditor&>(cve).value().value.isDefault();
   }
   // draw checkbox
-  dc.SetPen(*wxTRANSPARENT_PEN);
-  dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-  dc.DrawRectangle(x,y,16,16);
-  wxRect rect = RealRect(x+2,y+2,12,12);
+  int size = (int)icon_size.height;
+  wxRect rect = RealRect(x+1,y+1,size-2,size-2);
   if (radio) {
-    draw_radiobox(nullptr, dc, rect, active, itemEnabled(item));
+    draw_radiobox(this, dc, rect, active, itemEnabled(item));
   } else {
-    draw_checkbox(nullptr, dc, rect, active, itemEnabled(item));
+    draw_checkbox(this, dc, rect, active, itemEnabled(item));
   }
   // draw icon
-  DropDownChoiceListBase::drawIcon(dc, x + 16, y, item, selected);
+  DropDownChoiceListBase::drawIcon(dc, x + size, y, item, selected);
 }
 
 void DropDownMultipleChoiceList::onShow() {
@@ -104,7 +102,7 @@ DropDownList& MultipleChoiceValueEditor::initDropDown() {
 void MultipleChoiceValueEditor::determineSize(bool force_fit) {
   if (!nativeLook()) return;
   // item height
-  item_height = 16;
+  item_height = 18;
   // height depends on number of items and item height
   int item_count = field().choices->lastId();
   style().height = item_count * item_height;

src/gui/value/text.cpp

@@ -221,9 +221,9 @@ void DropDownWordList::drawIcon(DC& dc, int x, int y, size_t item, bool selected
     dc.DrawRectangle(x,y,16,16);
     wxRect rect = RealRect(x+2,y+2,12,12);
     if (radio) {
-      draw_radiobox(nullptr, dc, rect, items[item].active(), itemEnabled(item));
+      draw_radiobox(this, dc, rect, items[item].active(), itemEnabled(item));
     } else {
-      draw_checkbox(nullptr, dc, rect, items[item].active(), itemEnabled(item));
+      draw_checkbox(this, dc, rect, items[item].active(), itemEnabled(item));
     }
   }
 }