mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-15 14:16:07 -06:00
Core: DarkTheme adjustments rollback
This commit is contained in:
Mirek Fidler
parent
1376e64164
commit
f3c5f60389
5 changed files with 257 additions and 8 deletions
|
|
@ -242,13 +242,12 @@ int Grayscale2(const Color& c)
|
|||
return (c.GetR() + c.GetG() + c.GetB()) / 3;
|
||||
}
|
||||
|
||||
/* pre 2024 release values
|
||||
double DarkTheme_c[3] = { 0.4, 0.3, 0.4 };
|
||||
int DarkTheme_middle = 155;
|
||||
*/
|
||||
/*
|
||||
double DarkTheme_c[3] = { 0.3, 0.3, 0.4 };
|
||||
int DarkTheme_middle = 145;
|
||||
|
||||
*/
|
||||
Color DarkTheme(Color color)
|
||||
{
|
||||
if(IsNull(color))
|
||||
|
|
@ -268,7 +267,7 @@ Color DarkTheme(Color color)
|
|||
const double up = (256.0 - middle) / middle;
|
||||
const double down = 1 / up;
|
||||
|
||||
double m;
|
||||
double m; // target brightness
|
||||
if(m0 < middle)
|
||||
m = middle + (middle - m0) * up;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -89,6 +89,64 @@ LINKMODE_LOCK = "0";)";
|
|||
|
||||
#else
|
||||
|
||||
#ifdef CPU_32
|
||||
|
||||
const char *gcc_bm =
|
||||
R"(BUILDER = "GCC";
|
||||
COMPILER = "";
|
||||
COMMON_OPTIONS = "";
|
||||
COMMON_CPP_OPTIONS = "-std=c++17";
|
||||
COMMON_C_OPTIONS = "";
|
||||
COMMON_LINK = "";
|
||||
COMMON_FLAGS = "CPU_32";
|
||||
DEBUG_INFO = "2";
|
||||
DEBUG_BLITZ = "1";
|
||||
DEBUG_LINKMODE = "1";
|
||||
DEBUG_OPTIONS = "-O0";
|
||||
DEBUG_FLAGS = "";
|
||||
DEBUG_LINK = "";
|
||||
RELEASE_BLITZ = "1";
|
||||
RELEASE_LINKMODE = "1";
|
||||
RELEASE_OPTIONS = "-O3 -ffunction-sections -fdata-sections";
|
||||
RELEASE_FLAGS = "";
|
||||
RELEASE_LINK = "-Wl,--gc-sections";
|
||||
DEBUGGER = "gdb";
|
||||
ALLOW_PRECOMPILED_HEADERS = "0";
|
||||
DISABLE_BLITZ = "0";
|
||||
PATH = "";
|
||||
INCLUDE = "";
|
||||
LIB = "";
|
||||
LINKMODE_LOCK = "0";)";
|
||||
|
||||
const char *clang_bm =
|
||||
R"(BUILDER = "CLANG";
|
||||
COMPILER = "clang++";
|
||||
COMMON_OPTIONS = "";
|
||||
COMMON_CPP_OPTIONS = "-std=c++17 -Wno-logical-op-parentheses";
|
||||
COMMON_C_OPTIONS = "";
|
||||
COMMON_LINK = "";
|
||||
COMMON_FLAGS = "CPU_32";
|
||||
DEBUG_INFO = "2";
|
||||
DEBUG_BLITZ = "1";
|
||||
DEBUG_LINKMODE = "1";
|
||||
DEBUG_OPTIONS = "-O0";
|
||||
DEBUG_FLAGS = "";
|
||||
DEBUG_LINK = "";
|
||||
RELEASE_BLITZ = "1";
|
||||
RELEASE_LINKMODE = "1";
|
||||
RELEASE_OPTIONS = "-O3 -ffunction-sections -fdata-sections";
|
||||
RELEASE_FLAGS = "";
|
||||
RELEASE_LINK = "-Wl,--gc-sections";
|
||||
DEBUGGER = "gdb";
|
||||
ALLOW_PRECOMPILED_HEADERS = "0";
|
||||
DISABLE_BLITZ = "0";
|
||||
PATH = "";
|
||||
INCLUDE = "";
|
||||
LIB = "";
|
||||
LINKMODE_LOCK = "0";)";
|
||||
|
||||
#else
|
||||
|
||||
const char *gcc_bm =
|
||||
R"(BUILDER = "GCC";
|
||||
COMPILER = "";
|
||||
|
|
@ -145,6 +203,8 @@ LINKMODE_LOCK = "0";)";
|
|||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
void CreateBuildMethods()
|
||||
{
|
||||
#ifdef PLATFORM_COCOA
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ void InstantSetup()
|
|||
bmSet(bm, "COMMON_CPP_OPTIONS", "-std=c++17");
|
||||
bmSet(bm, "COMMON_C_OPTIONS", "");
|
||||
bmSet(bm, "COMMON_LINK", "");
|
||||
bmSet(bm, "COMMON_FLAGS", "");
|
||||
bmSet(bm, "COMMON_FLAGS", x64 ? "" : "CPU32");
|
||||
bmSet(bm, "DEBUG_INFO", "2");
|
||||
bmSet(bm, "DEBUG_BLITZ", "1");
|
||||
bmSet(bm, "DEBUG_LINKMODE", "0");
|
||||
|
|
@ -363,7 +363,7 @@ void InstantSetup()
|
|||
: "/bigobj /D_ATL_XP_TARGETING -D_CRT_SECURE_NO_WARNINGS");
|
||||
bmSet(bm, "COMMON_CPP_OPTIONS", "/std:c++17");
|
||||
bmSet(bm, "COMMON_C_OPTIONS", "");
|
||||
bmSet(bm, "COMMON_FLAGS", "");
|
||||
bmSet(bm, "COMMON_FLAGS", x64 ? "" : "CPU32");
|
||||
bmSet(bm, "DEBUG_INFO", "2");
|
||||
bmSet(bm, "DEBUG_BLITZ", "1");
|
||||
bmSet(bm, "DEBUG_LINKMODE", "0");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
PREMULTIPLIED
|
||||
IMAGE_ID(ide)
|
||||
IMAGE_ID(read_only)
|
||||
IMAGE_ID(build_rebuild_all)
|
||||
IMAGE_ID(info)
|
||||
IMAGE_ID(Cpp)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,236,189,61,139,29,205,150,231,91,247,142,213,110,187,205,120,247,229,220,175,144,158,156,129,199,189,78,211,12,140)
|
||||
|
|
@ -1777,3 +1781,179 @@ IMAGE_DATA(246,56,0,56,129,195,2,0,192,26,137,113,216,251,251,123,107,11,217,107
|
|||
IMAGE_DATA(0,96,141,196,56,172,175,15,27,242,174,95,114,165,67,249,171,106,114,13,185,22,192,26,193,97,1,0,96,141,244,225)
|
||||
IMAGE_DATA(176,255,63,41,74,111,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(56768, 1)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,156,233,107,156,85,20,198,39,73,247,218,214,218,197,90,109,99,109,173,221,197,47,126,243,147,32,248,65,65)
|
||||
IMAGE_DATA(68,16,241,67,251,15,136,86,20,4,17,33,21,21,171,20,45,74,145,34,46,72,81,138,84,169,38,109,109,246,125,155)
|
||||
IMAGE_DATA(44,147,201,54,153,236,251,190,111,237,49,207,11,103,184,189,222,119,150,55,73,243,78,123,46,60,16,102,50,121,207,253)
|
||||
IMAGE_DATA(61,231,60,247,205,76,200,190,147,158,147,30,89,178,100,201,146,37,43,30,214,233,211,167,41,22,173,116,189,241,190,98)
|
||||
IMAGE_DATA(229,45,126,44,126,45,53,115,241,34,186,21,13,179,217,217,89,75,51,51,51,52,61,61,77,147,147,147,52,49,49,65)
|
||||
IMAGE_DATA(99,99,99,52,50,50,66,195,195,195,52,56,56,72,253,253,253,212,219,219,43,62,68,177,194,177,1,223,169,169,41,139)
|
||||
IMAGE_DATA(247,220,220,28,205,207,207,91,194,215,120,12,207,225,123,198,199,199,105,116,116,244,14,254,125,125,125,212,211,211,67,93)
|
||||
IMAGE_DATA(93,93,212,209,209,65,109,109,109,226,131,178,194,177,0,75,48,5,91,244,57,122,30,220,111,221,186,101,9,95,227,49)
|
||||
IMAGE_DATA(158,1,157,255,192,192,128,145,127,75,75,11,5,131,193,251,222,7,211,190,193,12,236,192,112,185,249,55,53,53,81,99)
|
||||
IMAGE_DATA(99,35,213,215,215,223,87,30,216,245,28,88,33,51,76,252,151,50,127,152,127,32,16,8,241,175,173,173,189,47,102,193)
|
||||
IMAGE_DATA(180,191,206,206,78,234,238,238,182,206,74,149,63,206,82,156,169,56,91,121,6,192,59,214,243,23,63,27,215,48,241,111)
|
||||
IMAGE_DATA(104,104,160,186,186,58,139,127,77,77,13,85,87,87,223,179,30,152,246,213,222,222,126,7,127,244,43,114,99,104,104,200)
|
||||
IMAGE_DATA(98,201,51,192,30,160,215,193,28,226,190,199,115,220,251,120,13,94,203,217,163,242,199,181,90,91,91,141,252,253,126,63)
|
||||
IMAGE_DATA(249,124,62,139,127,101,101,229,61,231,129,105,63,96,1,38,232,75,228,3,114,66,207,32,158,1,213,3,85,204,222,212)
|
||||
IMAGE_DATA(251,122,246,48,255,230,230,230,80,246,235,252,171,170,170,168,162,162,130,188,94,239,61,227,129,190,7,236,29,12,208,135)
|
||||
IMAGE_DATA(200,3,176,49,205,128,234,1,122,155,125,80,133,199,184,239,245,115,215,46,123,84,254,156,253,58,255,242,242,114,42,45)
|
||||
IMAGE_DATA(45,165,146,146,146,184,247,64,173,29,253,134,185,199,252,131,5,207,0,24,241,12,240,57,160,123,192,62,168,226,199,85)
|
||||
IMAGE_DATA(246,156,251,220,251,225,178,135,249,115,246,35,123,84,254,197,197,197,84,88,88,24,183,252,245,222,193,158,209,119,225,102)
|
||||
IMAGE_DATA(64,205,33,246,0,153,14,198,38,225,57,149,61,231,78,164,222,183,203,126,100,79,89,89,153,213,251,38,254,241,226,129)
|
||||
IMAGE_DATA(94,51,250,12,253,134,189,243,12,128,135,122,14,168,30,112,22,169,62,152,164,114,231,190,87,217,171,185,111,186,239,68)
|
||||
IMAGE_DATA(239,235,217,195,252,139,138,138,168,160,160,128,242,242,242,226,202,3,189,86,236,17,125,134,126,83,103,64,207,33,59,15)
|
||||
IMAGE_DATA(216,7,246,2,138,244,158,142,202,94,255,157,75,237,125,53,123,208,251,122,246,48,255,156,156,156,184,241,64,173,17,125)
|
||||
IMAGE_DATA(133,254,194,62,121,6,248,28,208,115,72,245,0,217,173,250,16,237,123,105,38,113,238,152,114,95,191,239,209,179,39,63)
|
||||
IMAGE_DATA(63,159,114,115,115,45,254,153,153,153,174,231,175,239,29,125,133,254,194,62,121,6,212,28,82,61,208,231,128,125,112,202)
|
||||
IMAGE_DATA(93,23,231,142,41,247,245,251,30,53,123,192,63,59,59,155,50,50,50,92,63,3,106,109,232,39,236,11,253,133,125,242)
|
||||
IMAGE_DATA(12,68,242,64,157,5,59,150,11,151,90,29,78,118,175,211,127,223,141,212,251,156,61,89,89,89,22,127,221,131,149,35)
|
||||
IMAGE_DATA(253,255,165,239,21,253,132,125,161,191,244,28,82,207,2,246,128,207,100,248,224,148,187,46,187,159,195,185,99,202,125,187)
|
||||
IMAGE_DATA(222,55,241,119,147,7,106,77,232,35,244,19,246,133,254,210,115,200,110,14,236,222,27,78,76,76,76,134,60,49,242,79)
|
||||
IMAGE_DATA(72,72,72,134,76,63,83,205,29,245,158,39,92,239,187,121,6,212,154,208,71,232,39,236,139,115,40,156,7,60,11,225)
|
||||
IMAGE_DATA(216,47,134,191,157,7,156,59,166,123,30,83,239,187,149,191,90,15,234,71,31,153,60,224,179,64,207,34,246,32,28,251)
|
||||
IMAGE_DATA(197,242,55,121,160,178,231,220,209,239,121,76,252,221,230,129,90,11,234,71,31,97,63,152,105,236,143,207,2,125,14,248)
|
||||
IMAGE_DATA(119,3,211,123,240,58,251,165,224,111,242,192,46,119,236,122,223,237,252,81,63,250,40,146,7,234,44,220,237,51,77,191)
|
||||
IMAGE_DATA(158,41,119,194,245,190,155,249,163,126,213,3,204,54,123,160,159,7,236,129,250,250,164,164,164,195,203,93,47,174,161,103)
|
||||
IMAGE_DATA(38,179,143,148,59,110,227,175,214,129,123,5,212,143,125,96,150,77,115,192,247,69,236,131,222,139,43,193,159,251,38,90)
|
||||
IMAGE_DATA(246,110,242,64,173,1,181,135,243,64,61,147,217,3,157,253,221,226,175,123,96,119,175,25,79,252,81,19,60,64,126,178)
|
||||
IMAGE_DATA(7,250,121,160,231,145,91,248,163,230,244,244,244,184,231,207,30,168,115,0,15,76,179,160,127,198,180,146,252,99,101,239)
|
||||
IMAGE_DATA(102,254,172,72,30,104,245,175,83,180,220,43,116,173,112,245,199,59,127,246,64,207,35,246,65,248,47,126,69,83,191,201)
|
||||
IMAGE_DATA(3,253,115,37,143,240,119,180,162,169,159,179,85,247,65,248,47,126,197,90,63,159,205,240,65,248,47,126,57,173,223,240)
|
||||
IMAGE_DATA(121,158,240,215,86,75,246,41,138,69,141,105,111,44,137,130,169,175,25,213,116,245,21,163,2,87,94,50,170,241,242,139)
|
||||
IMAGE_DATA(70,249,47,189,176,36,170,189,240,76,76,18,254,194,95,248,59,227,159,241,245,97,75,149,87,246,80,187,119,43,77,14)
|
||||
IMAGE_DATA(173,166,219,227,30,186,125,219,67,243,243,30,154,155,77,160,217,233,68,154,153,76,164,233,241,36,154,26,91,69,147,35)
|
||||
IMAGE_DATA(171,104,98,225,251,198,7,214,208,88,223,26,26,237,89,75,35,221,235,104,184,115,29,13,181,175,167,193,214,13,52,208)
|
||||
IMAGE_DATA(188,145,250,131,27,169,47,240,0,245,54,108,162,158,186,77,212,237,223,76,93,190,45,212,81,189,133,218,43,31,164,182)
|
||||
IMAGE_DATA(133,235,181,150,109,165,150,146,135,168,185,104,27,5,11,183,83,83,254,118,10,228,238,160,198,236,157,212,144,185,147,234)
|
||||
IMAGE_DATA(51,30,166,186,155,187,168,246,198,46,242,95,123,132,106,82,119,147,239,239,221,84,125,245,81,170,250,235,49,171,238,138)
|
||||
IMAGE_DATA(63,246,144,247,242,94,42,255,61,153,74,127,75,166,146,75,143,83,241,175,251,168,232,151,125,84,248,211,19,84,240,227)
|
||||
IMAGE_DATA(126,202,255,97,63,229,93,60,64,185,223,63,73,57,23,14,82,246,119,7,41,235,219,167,40,243,252,161,133,253,31,162)
|
||||
IMAGE_DATA(244,115,135,233,230,87,71,232,223,179,71,232,198,23,71,233,250,231,199,232,218,167,199,40,237,147,227,148,154,114,130,210)
|
||||
IMAGE_DATA(82,142,83,218,153,19,214,215,169,41,79,11,127,225,47,252,157,242,207,58,73,44,225,239,140,127,205,55,71,67,18,254)
|
||||
IMAGE_DATA(194,95,248,11,127,225,47,252,133,191,251,249,55,167,191,73,44,225,239,140,191,239,203,3,33,9,127,225,47,252,133,191)
|
||||
IMAGE_DATA(240,23,254,194,223,253,252,131,215,95,39,150,240,119,198,191,250,179,189,33,9,255,248,226,223,244,207,171,196,18,254,206)
|
||||
IMAGE_DATA(248,87,165,236,10,41,86,254,129,63,95,38,150,240,119,198,191,242,163,109,33,9,127,225,47,252,133,191,240,23,254,194)
|
||||
IMAGE_DATA(223,253,252,213,191,89,18,254,206,248,87,124,176,57,36,225,47,252,133,191,240,23,254,194,95,248,187,159,127,195,165,231)
|
||||
IMAGE_DATA(137,37,252,157,241,247,190,183,62,36,225,47,252,133,191,240,23,254,194,95,248,187,159,127,253,207,207,17,75,248,59,227)
|
||||
IMAGE_DATA(95,254,206,234,144,132,191,240,23,254,194,95,248,11,127,225,239,126,254,117,23,159,37,150,240,119,198,191,236,173,132,144)
|
||||
IMAGE_DATA(132,191,240,23,254,206,248,171,178,251,255,30,254,243,199,140,170,57,119,200,40,223,217,253,70,169,127,179,170,170,234,204)
|
||||
IMAGE_DATA(110,163,42,63,222,97,84,197,135,91,205,82,222,147,87,229,125,127,131,81,229,239,174,53,235,237,85,70,169,204,133,191)
|
||||
IMAGE_DATA(240,23,254,206,248,203,146,37,75,150,44,89,178,150,111,253,7,159,134,24,122,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1856, 1)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,156,203,114,22,199,21,199,201,11,240,4,90,56,91,214,6,36,132,117,67,66,79,160,189,171,180,72,22,222)
|
||||
IMAGE_DATA(168,92,174,36,171,144,141,171,178,136,185,218,49,54,36,49,198,54,65,8,1,186,11,131,36,4,146,144,144,177,8,216)
|
||||
IMAGE_DATA(16,174,230,9,178,78,85,106,50,221,51,61,115,250,204,233,203,116,247,204,124,66,156,170,179,48,54,244,215,191,255,233)
|
||||
IMAGE_DATA(255,57,221,159,204,175,222,217,245,206,174,183,97,23,71,142,28,137,66,229,31,62,250,237,203,50,107,183,183,183,143,156)
|
||||
IMAGE_DATA(25,30,142,162,93,187,188,242,63,187,119,71,127,28,30,126,189,123,247,238,182,50,235,143,140,140,188,126,221,214,214,200)
|
||||
IMAGE_DATA(218,33,246,238,186,118,136,189,251,172,237,187,119,159,181,89,12,15,15,175,60,220,179,199,121,253,139,67,67,81,91,91)
|
||||
IMAGE_DATA(91,187,203,218,236,247,125,50,50,226,181,246,158,61,123,134,92,214,22,123,95,105,111,111,100,109,159,189,251,174,237,179)
|
||||
IMAGE_DATA(247,16,107,187,238,61,196,218,44,6,7,7,255,50,59,56,88,250,156,185,246,2,120,62,216,57,101,191,198,254,60,215)
|
||||
IMAGE_DATA(186,183,73,166,45,91,135,249,139,239,222,203,114,98,126,198,234,11,123,82,213,123,103,62,198,234,10,239,185,234,189,179)
|
||||
IMAGE_DATA(253,176,218,100,125,68,231,133,127,254,248,119,255,115,169,31,93,127,16,123,102,123,243,61,23,84,48,150,148,79,216,238)
|
||||
IMAGE_DATA(217,39,216,89,103,107,212,189,103,22,172,86,89,95,197,107,179,250,169,114,207,34,216,218,240,156,176,249,132,237,121,104)
|
||||
IMAGE_DATA(104,232,162,107,175,183,13,182,6,156,9,196,158,67,120,175,41,152,166,98,237,58,247,204,2,214,91,157,123,102,193,246)
|
||||
IMAGE_DATA(199,206,185,240,207,186,246,44,214,254,253,135,191,121,193,246,76,245,140,170,131,237,245,227,63,125,244,95,170,103,212,17)
|
||||
IMAGE_DATA(236,44,215,189,231,38,226,215,239,239,122,191,233,207,80,42,62,248,98,53,114,201,166,63,247,118,12,87,214,111,53,113)
|
||||
IMAGE_DATA(143,170,153,191,213,162,24,77,49,223,233,90,52,205,121,167,234,208,52,215,157,170,67,40,30,101,99,167,235,80,39,235)
|
||||
IMAGE_DATA(58,52,105,154,103,153,104,37,230,33,181,104,154,171,41,90,157,185,42,222,4,29,182,35,119,28,219,85,131,237,206,29)
|
||||
IMAGE_DATA(199,118,210,160,46,246,29,243,91,81,199,220,143,209,129,217,251,209,129,153,56,167,127,136,115,51,234,156,186,23,117,78)
|
||||
IMAGE_DATA(198,57,177,17,117,94,91,143,14,94,189,203,115,39,104,80,37,247,246,27,15,163,246,239,255,21,117,176,188,254,0,240)
|
||||
IMAGE_DATA(23,26,252,192,53,232,156,218,204,249,79,196,252,133,6,87,214,162,131,227,171,209,193,203,171,209,123,99,43,149,234,240)
|
||||
IMAGE_DATA(166,176,223,191,248,83,212,190,16,231,205,71,113,62,228,26,228,252,31,208,103,96,74,113,6,56,255,181,132,255,229,149)
|
||||
IMAGE_DATA(88,131,59,209,123,151,226,28,189,189,237,53,8,206,253,214,227,104,255,210,207,49,255,159,101,13,116,103,96,70,156,129)
|
||||
IMAGE_DATA(77,249,12,0,15,18,103,32,225,191,146,241,239,186,184,28,117,253,243,86,112,29,182,27,251,125,183,255,29,237,91,126)
|
||||
IMAGE_DATA(18,243,127,34,105,192,249,47,80,103,128,241,223,138,14,204,149,243,32,146,255,197,91,92,131,174,11,75,219,70,131,80)
|
||||
IMAGE_DATA(236,247,173,60,139,246,221,121,154,240,143,115,255,178,224,47,52,176,57,3,148,7,109,16,30,148,247,0,206,255,82,204)
|
||||
IMAGE_DATA(127,116,57,59,3,140,127,247,119,139,81,247,183,11,45,173,65,8,246,123,215,158,71,123,87,159,39,252,161,6,203,80)
|
||||
IMAGE_DATA(3,112,6,200,62,176,165,93,195,220,3,110,75,30,148,243,143,243,155,133,168,251,252,205,150,211,32,8,251,187,47,98)
|
||||
IMAGE_DATA(254,47,144,6,79,51,13,164,51,192,248,47,10,15,122,36,241,183,137,156,255,221,132,255,184,158,127,23,228,255,205,205)
|
||||
IMAGE_DATA(168,231,252,141,150,210,192,151,253,187,235,47,163,189,44,37,13,240,25,120,130,206,64,209,131,202,68,198,255,10,230,127)
|
||||
IMAGE_DATA(135,224,191,148,240,255,54,231,223,243,245,247,222,26,180,4,251,141,87,73,174,191,146,53,16,103,128,241,191,131,251,64)
|
||||
IMAGE_DATA(8,254,84,15,46,195,63,206,115,205,106,224,235,59,239,222,251,37,79,174,1,227,255,50,231,191,170,242,32,212,3,92)
|
||||
IMAGE_DATA(248,219,204,64,144,255,119,57,255,110,192,191,231,171,235,94,252,125,52,240,102,191,249,58,201,140,255,171,156,63,225,65)
|
||||
IMAGE_DATA(90,254,55,154,227,223,251,143,121,47,13,106,103,207,88,191,97,252,123,255,62,87,171,6,174,252,153,199,100,252,3,251)
|
||||
IMAGE_DATA(79,135,165,7,241,249,167,2,254,189,127,155,173,133,191,43,123,222,91,25,255,245,87,121,223,13,216,127,249,252,111,152)
|
||||
IMAGE_DATA(65,243,249,63,76,255,197,252,123,207,86,175,129,19,123,230,39,140,107,166,65,170,195,250,171,96,243,39,124,135,211,190)
|
||||
IMAGE_DATA(65,192,249,223,99,254,84,241,239,59,51,227,164,65,165,181,191,250,92,214,224,238,75,148,97,238,95,217,27,144,244,14)
|
||||
IMAGE_DATA(173,120,131,243,184,127,85,193,223,70,3,23,246,226,61,65,210,128,204,48,239,15,210,27,168,238,123,24,199,247,7,61)
|
||||
IMAGE_DATA(255,25,206,191,239,203,233,224,103,192,181,246,57,199,76,131,84,135,76,139,231,249,63,11,207,105,209,247,183,140,191,240)
|
||||
IMAGE_DATA(254,115,215,131,243,215,105,224,196,62,101,152,104,144,235,176,111,85,104,241,44,157,115,158,21,60,167,85,222,159,229,217)
|
||||
IMAGE_DATA(231,166,212,123,123,190,154,39,248,79,115,254,125,95,76,5,61,3,78,252,99,126,146,6,34,161,22,43,79,229,127,7)
|
||||
IMAGE_DATA(217,35,223,169,243,251,151,174,11,22,252,57,251,156,127,95,69,252,93,188,135,115,187,149,48,100,30,158,235,128,180,0)
|
||||
IMAGE_DATA(51,166,236,247,26,223,169,240,251,71,221,236,163,158,253,49,255,41,206,255,208,233,201,210,252,41,13,92,106,159,51,227)
|
||||
IMAGE_DATA(26,60,78,120,114,29,192,121,192,41,234,93,212,188,168,123,200,30,204,60,33,191,127,207,189,223,167,247,38,179,79,206)
|
||||
IMAGE_DATA(127,82,203,191,204,25,40,93,251,49,47,238,23,156,223,227,130,14,202,204,184,19,158,3,217,223,64,236,21,63,127,130)
|
||||
IMAGE_DATA(195,202,123,72,239,47,215,123,89,237,39,252,39,162,67,159,79,120,241,119,241,30,198,75,214,0,233,160,202,37,88,243)
|
||||
IMAGE_DATA(42,246,192,119,8,223,215,69,41,239,177,241,126,77,239,237,139,107,159,177,63,244,249,181,210,252,161,6,46,222,195,89)
|
||||
IMAGE_DATA(45,252,36,235,32,105,161,200,69,204,93,248,125,194,222,55,228,218,215,123,79,118,239,50,190,59,168,189,159,243,255,171)
|
||||
IMAGE_DATA(154,191,78,3,87,254,188,70,89,127,228,26,228,58,180,47,10,45,128,30,128,55,103,14,185,139,154,79,123,109,217,55)
|
||||
IMAGE_DATA(78,146,191,168,125,213,155,131,201,123,74,122,191,224,127,232,179,171,245,241,143,189,65,248,68,166,3,214,66,153,143,242)
|
||||
IMAGE_DATA(255,62,227,94,238,125,211,204,31,212,190,242,205,193,52,247,219,120,127,51,252,59,82,86,74,29,140,89,228,94,244,123)
|
||||
IMAGE_DATA(212,111,211,121,135,205,155,90,254,227,186,190,171,152,123,116,222,163,152,251,15,1,239,103,252,251,29,249,187,244,222,140)
|
||||
IMAGE_DATA(19,165,131,109,170,184,167,189,86,197,190,211,200,191,232,251,250,190,107,233,61,26,239,103,181,239,194,223,137,189,96,52)
|
||||
IMAGE_DATA(255,160,160,67,166,69,166,73,154,224,215,58,72,238,104,198,164,216,131,123,174,150,191,106,230,161,106,95,113,231,162,231)
|
||||
IMAGE_DATA(158,212,123,20,222,223,255,233,149,168,255,212,149,96,26,40,249,167,181,153,235,176,149,115,188,78,107,34,177,134,9,255)
|
||||
IMAGE_DATA(140,172,230,213,117,207,239,89,147,27,90,254,146,239,120,215,190,201,123,38,50,239,73,248,143,87,206,159,179,153,253,49)
|
||||
IMAGE_DATA(215,97,110,75,230,56,79,112,166,234,28,120,188,146,59,193,158,221,115,181,252,199,108,102,30,77,237,27,231,30,218,123)
|
||||
IMAGE_DATA(106,227,207,248,204,222,207,116,56,48,167,211,130,72,200,28,114,39,252,70,122,219,1,111,203,122,254,128,61,122,103,150)
|
||||
IMAGE_DATA(103,30,67,237,171,238,92,224,206,139,189,167,22,254,140,13,99,52,115,191,168,69,65,15,57,115,222,152,185,174,230,197)
|
||||
IMAGE_DATA(219,206,70,246,189,186,150,63,229,59,138,153,199,170,246,117,125,23,121,79,255,201,58,248,111,230,156,102,84,90,24,18)
|
||||
IMAGE_DATA(50,135,220,69,143,205,106,190,200,222,244,255,22,169,216,227,187,174,125,237,235,103,254,254,79,33,255,203,149,243,231,108)
|
||||
IMAGE_DATA(166,18,111,144,180,144,244,64,186,224,95,159,150,153,103,245,174,224,142,223,244,181,252,137,121,135,244,157,66,237,227,153)
|
||||
IMAGE_DATA(71,83,251,233,204,47,121,207,201,154,248,11,62,169,14,178,22,72,15,50,55,17,115,196,93,248,60,170,249,236,93,199)
|
||||
IMAGE_DATA(192,191,192,158,244,29,221,59,103,137,218,255,76,174,253,129,19,53,240,23,108,38,239,33,45,238,1,158,169,38,32,59)
|
||||
IMAGE_DATA(49,111,137,57,168,119,178,230,239,74,239,58,70,254,133,239,182,244,190,83,156,247,53,51,15,213,119,79,10,254,99,213)
|
||||
IMAGE_DATA(243,103,108,38,214,101,94,147,72,15,171,220,144,255,140,137,117,192,189,88,243,252,187,148,244,110,171,229,79,245,91,173)
|
||||
IMAGE_DATA(239,152,231,125,219,218,31,56,94,61,127,206,228,90,206,170,160,69,169,4,204,97,189,75,220,193,247,88,233,221,202,200)
|
||||
IMAGE_DATA(95,244,91,228,249,210,188,131,125,7,247,92,91,223,63,149,215,126,109,252,97,66,45,74,102,129,57,197,93,188,231,136)
|
||||
IMAGE_DATA(123,109,60,223,107,249,83,236,241,172,169,243,29,143,218,31,56,126,41,24,127,173,6,130,17,102,151,101,202,22,230,85)
|
||||
IMAGE_DATA(130,53,102,110,224,158,204,246,6,254,36,123,11,207,199,190,67,189,243,72,243,190,236,251,174,181,239,242,254,156,240,89)
|
||||
IMAGE_DATA(147,185,241,76,123,165,146,51,232,165,10,230,137,207,64,238,43,25,119,49,219,235,194,138,189,110,222,193,190,83,184,235)
|
||||
IMAGE_DATA(134,171,125,215,247,127,198,136,231,56,204,53,133,38,20,235,53,249,247,94,6,254,14,235,125,76,230,46,102,123,45,255)
|
||||
IMAGE_DATA(50,236,201,121,71,229,59,197,187,46,172,253,129,99,245,241,231,124,46,231,73,235,161,73,204,27,214,58,240,25,204,93)
|
||||
IMAGE_DATA(188,165,105,249,187,176,215,121,190,182,231,230,181,95,39,255,68,131,59,128,153,172,135,85,142,169,152,171,184,231,239,9)
|
||||
IMAGE_DATA(90,254,112,206,33,217,107,250,173,118,214,71,181,127,66,212,190,158,189,15,127,237,25,184,132,152,141,225,36,24,195,196)
|
||||
IMAGE_DATA(191,31,50,87,112,23,247,89,61,127,75,246,228,247,42,233,207,148,96,207,55,248,206,192,177,209,210,236,33,127,39,15)
|
||||
IMAGE_DATA(26,205,121,113,118,89,82,108,17,103,145,163,26,230,226,205,30,112,23,119,42,93,20,102,76,19,251,51,152,189,102,222)
|
||||
IMAGE_DATA(81,248,206,192,209,242,252,67,252,252,97,198,106,116,89,214,195,34,179,183,121,21,115,130,187,184,207,106,249,147,236,231)
|
||||
IMAGE_DATA(204,236,137,89,51,243,124,80,251,3,39,80,237,107,216,135,224,175,211,128,51,98,204,10,28,109,19,241,70,204,179,119)
|
||||
IMAGE_DATA(75,248,142,96,248,123,50,196,189,86,154,239,149,236,77,253,214,236,59,135,29,106,159,226,239,124,6,48,191,178,121,1)
|
||||
IMAGE_DATA(49,135,247,87,196,93,204,54,90,254,42,246,103,109,216,155,60,223,222,119,116,252,41,246,206,252,49,59,151,132,117,78)
|
||||
IMAGE_DATA(50,207,103,202,110,195,223,141,209,43,221,107,241,156,163,241,28,146,189,222,243,15,31,189,88,11,127,147,6,130,91,23)
|
||||
IMAGE_DATA(207,37,67,46,202,172,51,222,128,57,188,67,1,238,201,92,99,224,95,240,27,122,198,44,205,30,121,190,206,119,116,236)
|
||||
IMAGE_DATA(117,252,93,207,64,194,108,81,78,37,99,130,53,174,243,140,57,120,47,6,51,165,145,191,202,235,29,216,247,99,246,169)
|
||||
IMAGE_DATA(231,31,254,36,108,237,123,159,1,193,15,115,85,114,6,172,1,239,34,115,48,203,91,252,125,24,180,223,40,102,76,45)
|
||||
IMAGE_DATA(251,113,130,125,90,251,142,236,109,248,59,159,129,243,55,101,158,186,60,143,243,134,158,57,152,39,109,34,243,27,169,207)
|
||||
IMAGE_DATA(98,246,215,244,236,225,172,115,92,102,95,85,237,251,158,129,30,193,49,206,110,148,61,56,191,166,121,215,17,210,124,95)
|
||||
IMAGE_DATA(134,253,81,119,246,101,248,123,105,192,56,22,216,2,198,34,207,81,105,87,223,190,209,234,236,125,248,179,160,217,22,89)
|
||||
IMAGE_DATA(11,79,129,89,71,200,119,43,69,175,149,216,155,61,159,69,72,254,222,26,16,108,139,57,159,223,149,96,138,25,18,207)
|
||||
IMAGE_DATA(146,240,30,165,156,109,192,124,35,222,209,40,175,23,119,171,22,101,111,226,111,163,65,129,43,201,154,226,109,193,92,203)
|
||||
IMAGE_DATA(29,205,55,42,246,39,137,249,62,48,123,31,254,190,103,128,107,128,217,82,137,121,99,230,94,220,241,91,142,134,253,177)
|
||||
IMAGE_DATA(114,126,111,195,223,135,125,48,13,48,91,42,83,222,114,157,99,230,22,220,133,215,104,253,6,191,41,180,46,123,19,127)
|
||||
IMAGE_DATA(107,13,206,206,130,156,145,89,83,188,49,115,35,119,202,107,44,106,94,248,77,124,175,181,157,239,109,216,135,228,31,74)
|
||||
IMAGE_DATA(131,156,49,193,90,203,27,49,63,61,161,172,119,171,154,215,120,125,43,178,15,169,1,215,225,203,105,148,52,111,153,185)
|
||||
IMAGE_DATA(162,214,149,220,229,154,151,231,27,236,55,118,125,182,73,246,161,53,224,58,16,188,251,78,107,152,187,112,55,249,141,225)
|
||||
IMAGE_DATA(13,185,149,216,87,161,1,11,218,87,8,127,41,48,39,184,159,50,113,183,123,63,110,85,246,182,26,56,233,64,241,198)
|
||||
IMAGE_DATA(204,97,173,91,213,123,177,230,67,115,175,155,125,149,26,100,90,216,48,183,230,174,255,249,156,237,200,190,140,6,62,58)
|
||||
IMAGE_DATA(136,144,152,91,112,247,13,219,125,53,201,94,68,93,26,212,21,219,137,189,8,219,207,220,202,58,148,217,67,211,188,169)
|
||||
IMAGE_DATA(40,243,249,91,73,135,178,159,187,105,206,166,40,187,159,38,180,112,249,140,77,115,45,19,46,251,171,90,11,159,207,212)
|
||||
IMAGE_DATA(52,79,215,240,217,179,143,38,161,214,109,154,95,168,8,197,163,174,108,154,87,85,209,52,215,157,202,29,71,211,156,119)
|
||||
IMAGE_DATA(42,119,42,222,50,111,157,120,203,188,245,226,77,102,253,127,125,96,110,170,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(3168, 2)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,151,49,14,130,48,20,134,241,30,38,112,24,79,35,147,7,48,113,113,100,113,99,100,53,241,6,174,184,120)
|
||||
IMAGE_DATA(0,119,142,192,1,168,252,132,103,154,63,21,219,82,236,160,77,254,132,208,230,125,143,191,239,65,89,101,73,150,252,199)
|
||||
IMAGE_DATA(219,177,238,85,244,82,129,85,140,177,63,177,155,60,223,169,199,163,81,109,171,130,8,177,16,19,177,39,114,24,216,85)
|
||||
IMAGE_DATA(117,14,198,101,33,246,68,14,5,114,92,138,45,26,125,40,12,252,230,122,189,45,206,7,99,244,128,135,83,156,123,93)
|
||||
IMAGE_DATA(123,231,48,214,163,19,31,188,227,102,211,29,250,117,172,125,154,118,167,237,182,91,138,207,92,240,46,101,169,32,125,14)
|
||||
IMAGE_DATA(215,161,249,96,233,108,48,121,141,204,177,7,253,173,65,190,124,102,191,243,88,214,113,110,115,248,96,177,231,83,251,131)
|
||||
IMAGE_DATA(121,169,73,225,178,92,248,92,99,110,245,53,143,15,31,153,239,211,111,190,254,179,247,7,199,119,195,92,190,169,223,124)
|
||||
IMAGE_DATA(248,190,253,199,124,219,190,182,121,246,111,61,255,28,190,75,239,97,45,242,181,237,61,27,62,98,217,212,191,190,46,36)
|
||||
IMAGE_DATA(223,182,6,116,159,66,250,47,226,247,47,231,32,243,166,253,9,193,55,213,2,75,190,133,33,251,207,36,236,175,124,115)
|
||||
IMAGE_DATA(69,62,189,63,193,143,125,254,138,125,254,140,125,254,126,229,16,233,255,67,207,33,214,255,215,207,141,39,90,185,23,172)
|
||||
IMAGE_END_DATA(320, 1)
|
||||
|
|
|
|||
|
|
@ -59,13 +59,23 @@ void MyApp::Paint(Draw& w)
|
|||
w.DrawRect(i * 32, 35, 32, 32, DarkTheme(col[i]));
|
||||
}
|
||||
|
||||
Vector<Image> img = { CtrlImg::CdRom__UHD(), CtrlImg::open(), CtrlImg::new_doc(), CtrlImg::undo(), CtrlImg::select_all(), CtrlImg::copy() };
|
||||
Vector<Image> img = { CtrlImg::CdRom__UHD(), CtrlImg::open(), CtrlImg::new_doc(), CtrlImg::undo(),
|
||||
CtrlImg::select_all(), CtrlImg::copy(), DarkImg::read_only(), DarkImg::build_rebuild_all(),
|
||||
DarkImg::info(), DarkImg::Cpp() };
|
||||
for(int i = 0; i < img.GetCount(); i++) {
|
||||
w.DrawImage(i * 40, 70, 32, 32, img[i]);
|
||||
w.DrawImage(i * 40, 120, 32, 32, DarkTheme(img[i]));
|
||||
}
|
||||
|
||||
Size tsz = GetTextSize("Test", StdFont());
|
||||
w.DrawRect(0, 200, tsz.cx * col.GetCount(), tsz.cy, White());
|
||||
for(int i = 0; i < col.GetCount(); i++)
|
||||
w.DrawText(i * tsz.cx, 200, "Text", StdFont(), col[i]);
|
||||
|
||||
int x = col.GetCount() * 32 + 50;
|
||||
for(int i = 0; i < col.GetCount(); i++)
|
||||
w.DrawText(i * tsz.cx, 200 + tsz.cy, "Text", StdFont(), DarkTheme(col[i]));
|
||||
|
||||
int x = tsz.cx * 32 + 50;
|
||||
w.DrawImage(x, 0, DarkImg::ide());
|
||||
x += DarkImg::ide().GetWidth();
|
||||
w.DrawImage(x, 0, DarkTheme(DarkImg::ide()));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue