From adbc2622db49ef90b48392cb9db8ee8d0ed5d704 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Fri, 7 Mar 2025 14:58:51 -0500 Subject: Paintings in area popups now use owl icon --- VERSION.yaml | 1 + assets/checked_owl.png | Bin 0 -> 262 bytes src/area_popup.cpp | 6 +++++- src/area_popup.h | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 assets/checked_owl.png diff --git a/VERSION.yaml b/VERSION.yaml index a37b23a..c4ad3ec 100644 --- a/VERSION.yaml +++ b/VERSION.yaml @@ -20,6 +20,7 @@ packages: - zlib1.dll - assets/areas.yaml - assets/checked.png + # TODO: next release will contain the checked owl - assets/ids.yaml - assets/lingo_map.png - assets/LL1.yaml diff --git a/assets/checked_owl.png b/assets/checked_owl.png new file mode 100644 index 0000000..f53ddd3 Binary files /dev/null and b/assets/checked_owl.png differ diff --git a/src/area_popup.cpp b/src/area_popup.cpp index 9cc1208..2ba9586 100644 --- a/src/area_popup.cpp +++ b/src/area_popup.cpp @@ -156,7 +156,7 @@ void AreaPopup::UpdateIndicators() { mem_dc.SetTextForeground(*text_color); bool checked = reachable && AP_IsPaintingChecked(painting.internal_id); - const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_; + const wxBitmap* eye_ptr = checked ? checked_owl_ : unchecked_owl_; mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), cur_height}); wxSize item_extent = mem_dc.GetTextExtent(painting.display_name); @@ -187,4 +187,8 @@ void AreaPopup::LoadIcons() { FromDIP(wxSize{32, 32})); checked_eye_ = GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32})); + unchecked_owl_ = + GetTheIconCache().GetIcon("assets/owl.png", FromDIP(wxSize{32, 32})); + checked_owl_ = GetTheIconCache().GetIcon("assets/checked_owl.png", + FromDIP(wxSize{32, 32})); } diff --git a/src/area_popup.h b/src/area_popup.h index d2d50b9..2401e4e 100644 --- a/src/area_popup.h +++ b/src/area_popup.h @@ -23,6 +23,8 @@ class AreaPopup : public wxScrolledCanvas { const wxBitmap* unchecked_eye_; const wxBitmap* checked_eye_; + const wxBitmap* unchecked_owl_; + const wxBitmap* checked_owl_; wxBitmap rendered_; }; -- cgit 1.4.1