From 67027c7021fa18807a66657795e23df7e411a7be Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Wed, 8 Dec 2021 23:40:30 +0100 Subject: [PATCH 1/6] Added icon name --- src/icon.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/icon.h b/src/icon.h index 92dde15..7d84b34 100644 --- a/src/icon.h +++ b/src/icon.h @@ -2,6 +2,8 @@ // system includes #include +#include +#include namespace espgui { template @@ -11,5 +13,7 @@ struct Icon static constexpr auto HEIGHT=height; const unsigned short buffer[width*height]; + std::optional name{std::nullopt}; + }; } // namespace espgui From ae6e7fb72aeba33a98937184bf3184a61f0edfaa Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Dec 2021 11:07:50 +0100 Subject: [PATCH 2/6] Updated to const --- src/icon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icon.h b/src/icon.h index 7d84b34..6288a4c 100644 --- a/src/icon.h +++ b/src/icon.h @@ -13,7 +13,7 @@ struct Icon static constexpr auto HEIGHT=height; const unsigned short buffer[width*height]; - std::optional name{std::nullopt}; + const char * const name{}; }; } // namespace espgui From 8be7d494293ed337f7b58d677f01409e9ff657ce Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Dec 2021 19:41:29 +0100 Subject: [PATCH 3/6] Update unchecked.cpp --- src/icons/unchecked.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icons/unchecked.cpp b/src/icons/unchecked.cpp index d16ff69..5944189 100644 --- a/src/icons/unchecked.cpp +++ b/src/icons/unchecked.cpp @@ -39,6 +39,6 @@ const Icon<24, 24> unchecked{{ 0x0000, 0x0020, 0x0000, 0x630D, 0x8C71, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, // 0x0220 (544) pixels 0x8C71, 0x8410, 0x8C51, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0230 (560) pixels 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0240 (576) pixels -}}; +},"unchecked"}; } // namespace icons } // namespace espgui From 3ddbaa791e522ce86c3ad36909e98af8c4ab7506 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Dec 2021 19:41:49 +0100 Subject: [PATCH 4/6] Update back.cpp --- src/icons/back.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icons/back.cpp b/src/icons/back.cpp index 998b11a..3a8ad02 100644 --- a/src/icons/back.cpp +++ b/src/icons/back.cpp @@ -39,6 +39,6 @@ const Icon<24, 24> back{{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0109, 0x01AD, 0x018C, // 0x0220 (544) pixels 0x22B0, 0x32F0, 0x761E, 0x016C, 0x1A2E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0230 (560) pixels 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x014B, 0x018C, 0x018C, 0x09CD, 0x4C77, 0x012B, 0x1A0E, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0240 (576) pixels -}}; +},"back"}; } // namespace icons } // namespace espgui From ef28666e0fb720d44d00f673b991e90c9069b3a3 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Dec 2021 19:42:10 +0100 Subject: [PATCH 5/6] Update checked.cpp --- src/icons/checked.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icons/checked.cpp b/src/icons/checked.cpp index 45f7f54..0933183 100644 --- a/src/icons/checked.cpp +++ b/src/icons/checked.cpp @@ -39,6 +39,6 @@ const Icon<24, 24> checked{{ 0x0000, 0x0020, 0x0000, 0x630D, 0x8C71, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, 0x8C51, // 0x0220 (544) pixels 0x8C71, 0x8410, 0x8C51, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0230 (560) pixels 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0240 (576) pixels -}}; +}, "checked"}; } // namespace icons } // namespace espgui From a3abfed75589952843ac8ae6235fa55893e3a9c9 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 9 Dec 2021 22:38:17 +0100 Subject: [PATCH 6/6] Update icon.h --- src/icon.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/icon.h b/src/icon.h index 6288a4c..8ca8a1d 100644 --- a/src/icon.h +++ b/src/icon.h @@ -2,8 +2,6 @@ // system includes #include -#include -#include namespace espgui { template