mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-24 14:22:40 -06:00
CtrlLib: UHD fixes
git-svn-id: svn://ultimatepp.org/upp/trunk@12242 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
a0c8b41d4b
commit
7b37002bf2
3 changed files with 94 additions and 88 deletions
|
|
@ -235,75 +235,79 @@ IMAGE_DATA(236,219,6,122,63,235,7,97,223,246,15,245,87,120,90,0,0,0,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(1152, 16)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,90,223,79,28,85,20,30,160,13,160,248,96,82,27,255,0,95,124,52,241,201,104,226,139,47,250,164,182,233)
|
||||
IMAGE_DATA(155,137,198,248,208,23,147,38,245,165,182,146,38,141,177,6,99,52,54,214,40,161,214,31,141,11,129,96,113,161,148,117)
|
||||
IMAGE_DATA(149,108,64,86,126,164,42,89,8,1,182,44,200,238,150,165,44,11,101,113,155,227,124,3,151,206,189,123,239,220,153,133)
|
||||
IMAGE_DATA(45,44,236,185,249,50,179,247,126,247,59,103,238,156,123,102,55,59,70,157,113,196,168,50,42,13,216,157,120,132,128,222)
|
||||
IMAGE_DATA(96,27,249,127,254,142,154,175,93,230,128,62,140,49,30,227,2,19,99,127,80,44,58,178,213,143,115,244,177,113,214,15)
|
||||
IMAGE_DATA(13,244,7,70,238,72,129,49,112,24,31,126,161,213,51,156,148,2,99,224,216,249,56,246,12,39,164,176,115,236,231,55)
|
||||
IMAGE_DATA(135,226,82,236,20,191,123,112,94,10,53,255,95,41,212,252,57,41,84,252,27,127,206,74,177,83,252,174,112,76,10,53)
|
||||
IMAGE_DATA(127,70,138,157,226,7,6,167,164,144,241,145,83,189,195,19,82,136,249,198,242,185,255,86,68,10,49,159,189,238,23,47)
|
||||
IMAGE_DATA(251,209,168,51,142,26,135,204,6,155,158,158,166,112,56,76,161,80,136,130,193,160,20,24,3,135,113,129,55,222,189,64)
|
||||
IMAGE_DATA(207,189,122,138,158,124,246,77,14,47,28,123,143,222,62,221,64,147,147,147,148,78,167,173,185,224,2,95,53,221,164,230)
|
||||
IMAGE_DATA(214,65,10,4,38,45,180,180,13,209,215,223,254,106,241,129,181,181,53,203,31,116,193,109,108,28,202,195,197,143,58,232)
|
||||
IMAGE_DATA(252,135,77,150,31,24,248,240,11,93,140,139,6,254,199,13,63,88,28,59,31,254,193,207,229,114,28,192,255,226,243,102)
|
||||
IMAGE_DATA(37,63,155,205,114,208,241,87,87,87,57,232,248,203,203,203,28,116,252,165,165,37,14,58,126,42,149,226,160,227,39,147)
|
||||
IMAGE_DATA(73,14,58,126,60,30,231,160,227,207,205,205,113,208,241,99,177,24,7,29,63,26,141,114,208,241,71,71,71,57,168,248)
|
||||
IMAGE_DATA(200,93,240,7,6,6,56,128,223,240,201,143,28,31,185,138,60,199,152,12,23,46,94,165,23,79,156,177,248,216,47,108)
|
||||
IMAGE_DATA(63,32,207,145,187,240,15,64,23,220,147,103,46,89,192,126,193,94,196,94,3,31,126,196,253,8,93,112,177,23,1,236)
|
||||
IMAGE_DATA(97,28,49,87,101,24,99,220,93,43,22,189,215,62,160,104,215,89,162,240,251,22,110,119,159,163,144,239,188,180,88,128)
|
||||
IMAGE_DATA(75,237,207,231,33,241,205,83,228,251,244,173,188,98,97,233,130,35,24,248,193,47,143,231,221,108,43,6,147,47,22,11)
|
||||
IMAGE_DATA(240,71,175,188,172,228,139,197,66,199,207,100,50,28,116,124,118,83,25,116,252,133,133,5,14,58,126,34,145,224,161,225)
|
||||
IMAGE_DATA(207,207,207,115,208,241,197,205,175,227,207,204,204,112,208,241,197,205,175,227,71,34,17,14,58,254,200,200,8,7,21,31)
|
||||
IMAGE_DATA(185,11,126,95,95,31,7,240,127,187,124,34,175,88,32,207,49,38,67,203,103,239,72,139,5,242,28,185,11,255,0,116)
|
||||
IMAGE_DATA(193,61,16,197,162,165,195,111,125,102,55,14,139,219,230,191,33,45,22,224,138,55,154,1,115,196,98,97,215,21,1,63)
|
||||
IMAGE_DATA(226,205,86,113,25,202,252,131,199,31,27,27,147,66,198,71,78,141,143,143,75,209,223,223,159,87,44,144,179,42,126,123)
|
||||
IMAGE_DATA(87,64,90,44,48,7,126,88,204,208,5,119,87,139,69,33,240,251,253,228,243,249,168,169,169,137,3,250,48,38,114,1)
|
||||
IMAGE_DATA(84,106,92,52,235,199,57,250,216,56,235,135,6,250,85,190,49,6,14,251,12,191,118,93,17,24,3,199,206,215,93,95)
|
||||
IMAGE_DATA(153,95,230,59,241,189,228,155,215,124,246,186,95,216,28,183,251,209,11,140,199,204,86,97,182,178,149,173,36,172,156,176)
|
||||
IMAGE_DATA(101,43,41,171,51,91,49,173,243,250,85,234,188,126,133,60,241,59,220,243,97,248,142,233,61,50,7,255,182,120,117,241)
|
||||
IMAGE_DATA(179,120,89,12,110,226,23,227,221,78,252,186,120,165,159,37,241,122,137,95,102,183,163,19,100,84,111,126,175,223,52,114)
|
||||
IMAGE_DATA(128,106,92,53,95,102,124,191,224,92,77,212,59,240,18,240,6,14,153,238,93,56,119,39,166,14,78,30,172,224,92,117)
|
||||
IMAGE_DATA(53,178,171,243,18,136,92,255,176,81,37,123,226,233,238,101,190,51,65,200,203,178,240,14,107,205,229,168,216,252,215,218)
|
||||
IMAGE_DATA(131,233,178,204,109,150,122,9,216,41,251,85,250,238,227,215,44,132,27,65,183,129,21,107,97,156,226,116,95,163,170,205)
|
||||
IMAGE_DATA(165,40,96,33,188,214,165,237,212,177,98,143,111,152,98,33,118,51,176,135,181,192,188,109,179,106,61,56,87,84,45,213)
|
||||
IMAGE_DATA(185,186,106,61,110,139,6,255,215,47,36,198,41,149,156,160,197,133,41,186,155,138,210,210,98,140,150,151,230,40,147,158)
|
||||
IMAGE_DATA(167,149,229,36,173,174,44,208,189,213,187,148,93,75,211,122,118,133,254,91,191,71,185,220,58,221,191,159,219,120,152,23)
|
||||
IMAGE_DATA(85,16,111,24,180,181,52,210,47,237,223,83,183,223,71,193,158,118,10,253,222,73,3,253,1,26,30,12,209,63,127,133)
|
||||
IMAGE_DATA(105,60,114,139,166,38,35,52,59,51,69,137,248,44,45,166,146,148,201,164,41,155,93,123,8,17,238,125,193,189,185,134)
|
||||
IMAGE_DATA(21,166,100,233,8,238,200,26,150,214,37,31,144,53,172,49,27,43,172,202,127,22,108,63,156,158,57,25,34,21,74,125)
|
||||
IMAGE_DATA(190,185,20,142,95,96,242,204,154,164,56,194,74,253,200,146,66,118,52,31,200,15,30,201,47,189,118,154,236,128,137,125)
|
||||
IMAGE_DATA(230,51,252,176,185,182,149,210,9,246,137,204,188,246,229,57,60,98,110,150,90,243,166,186,49,18,204,117,14,56,232,25)
|
||||
IMAGE_DATA(155,95,70,246,163,158,56,199,73,79,167,47,91,115,157,158,74,147,205,43,32,62,237,28,73,142,184,26,19,181,182,11)
|
||||
IMAGE_DATA(153,230,118,227,43,198,250,217,199,189,234,169,180,132,249,94,226,243,100,78,122,133,88,41,232,9,249,225,108,71,205,226)
|
||||
IMAGE_DATA(250,72,129,197,213,181,19,23,186,118,121,99,135,23,119,175,234,58,109,64,149,174,155,13,85,168,174,74,91,19,139,155)
|
||||
IMAGE_DATA(120,149,253,134,34,173,100,186,50,142,93,219,222,231,4,113,190,142,91,172,120,139,185,190,246,241,66,117,85,154,130,78)
|
||||
IMAGE_DATA(33,241,122,50,55,186,133,88,41,234,42,242,202,217,170,204,175,236,236,7,17,38,176,55,99,84,231,226,43,168,173,173)
|
||||
IMAGE_DATA(173,22,60,11,177,23,211,1,251,11,186,121,66,240,194,38,203,206,237,209,216,223,153,241,30,145,237,156,19,170,54,27)
|
||||
IMAGE_DATA(126,11,49,195,239,252,227,175,191,178,5,124,102,253,245,103,79,113,55,0,159,25,95,102,76,163,144,49,39,127,78,113)
|
||||
IMAGE_DATA(238,191,11,170,49,30,221,250,235,14,147,254,86,52,102,63,41,26,179,115,138,198,236,152,162,49,123,90,209,152,25,138)
|
||||
IMAGE_DATA(230,118,190,206,191,46,126,221,245,59,173,159,185,212,53,86,14,57,213,29,153,65,0,78,16,8,130,197,5,225,162,113)
|
||||
IMAGE_DATA(196,103,244,99,156,57,219,175,92,47,102,212,26,79,112,91,21,86,95,95,79,118,136,53,29,125,98,157,182,243,100,227)
|
||||
IMAGE_DATA(34,175,204,41,115,246,2,103,107,3,84,154,117,167,188,1,202,156,131,198,177,94,53,112,122,2,56,37,190,206,17,211)
|
||||
IMAGE_DATA(216,43,99,170,197,0,254,7,225,55,45,154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1632, 53)
|
||||
IMAGE_DATA(120,156,237,90,91,104,92,69,24,62,105,83,170,16,161,226,5,159,139,15,62,248,34,248,36,10,121,241,197,55,69,233)
|
||||
IMAGE_DATA(155,160,136,15,125,17,132,250,82,47,80,40,98,37,34,138,98,69,67,106,189,20,146,96,136,141,155,52,77,140,134,37)
|
||||
IMAGE_DATA(49,49,23,42,134,77,8,73,183,185,152,236,54,73,115,109,54,166,252,158,239,36,99,207,204,206,236,204,236,238,57,187)
|
||||
IMAGE_DATA(107,206,183,124,236,238,204,247,255,255,183,115,254,153,179,97,227,212,56,15,58,135,157,67,14,112,115,49,65,96,111,79)
|
||||
IMAGE_DATA(11,197,126,250,150,154,46,157,231,136,49,204,49,29,211,130,147,227,191,211,108,114,244,191,113,188,198,24,155,103,227,200)
|
||||
IMAGE_DATA(129,241,238,209,155,82,98,14,26,166,71,93,228,234,26,73,75,137,57,104,252,122,60,119,141,164,164,244,107,252,175,175)
|
||||
IMAGE_DATA(14,47,74,89,44,125,231,208,130,148,106,253,223,82,170,245,243,82,170,244,87,254,152,147,178,88,250,142,193,89,41,213)
|
||||
IMAGE_DATA(250,25,41,139,165,239,30,154,150,82,166,71,79,245,142,76,74,41,246,27,235,231,254,107,9,41,197,126,182,221,47,54)
|
||||
IMAGE_DATA(251,209,169,113,30,118,170,221,7,112,253,250,117,26,28,28,164,120,60,78,61,61,61,82,98,14,26,166,5,95,126,227)
|
||||
IMAGE_DATA(44,61,245,252,155,244,200,147,175,112,124,230,197,183,232,181,83,117,52,53,53,69,107,107,107,94,44,180,224,151,13,87)
|
||||
IMAGE_DATA(169,233,199,33,234,238,158,242,216,220,50,76,95,125,243,139,167,7,183,183,183,189,122,200,11,109,125,253,112,22,207,125)
|
||||
IMAGE_DATA(208,70,103,222,111,240,234,0,208,163,46,242,98,94,4,244,31,214,125,239,105,252,122,212,135,126,119,119,151,35,244,159)
|
||||
IMAGE_DATA(125,218,164,212,103,50,25,142,58,253,214,214,22,71,157,126,125,125,157,163,78,191,186,186,202,81,167,95,94,94,230,168)
|
||||
IMAGE_DATA(211,167,211,105,142,58,253,226,226,34,71,157,126,126,126,158,163,78,63,59,59,203,81,167,79,38,147,28,117,250,177,177)
|
||||
IMAGE_DATA(49,142,42,61,122,23,250,129,129,1,142,208,215,125,244,3,167,71,175,162,207,49,39,227,217,115,23,169,246,196,105,79)
|
||||
IMAGE_DATA(143,253,194,246,3,250,28,189,139,250,32,242,66,123,242,244,231,30,177,95,176,23,177,215,160,71,29,113,63,34,47,180)
|
||||
IMAGE_DATA(216,139,32,246,48,158,17,171,2,230,152,182,100,135,69,239,165,247,40,217,241,14,209,224,219,30,111,116,190,75,241,198)
|
||||
IMAGE_DATA(51,210,195,2,90,106,125,58,139,169,175,31,165,198,143,95,205,58,44,188,188,208,8,128,190,231,139,151,178,46,182,231)
|
||||
IMAGE_DATA(193,213,139,135,5,244,99,23,158,83,234,197,195,66,167,223,216,216,224,168,211,179,139,202,168,211,47,45,45,113,212,233)
|
||||
IMAGE_DATA(83,169,20,79,141,126,97,97,129,163,78,47,110,126,157,126,102,102,134,163,78,47,110,126,157,62,145,72,112,212,233,71)
|
||||
IMAGE_DATA(71,71,57,170,244,232,93,232,251,250,250,56,66,255,235,249,19,89,135,5,250,28,115,50,54,127,242,186,244,176,64,159)
|
||||
IMAGE_DATA(163,119,81,31,68,94,104,15,196,97,209,220,22,243,222,179,11,135,197,109,137,93,145,30,22,208,138,23,154,17,49,226)
|
||||
IMAGE_DATA(97,225,207,43,18,117,196,139,173,210,50,70,250,131,167,31,31,31,151,82,166,71,79,77,76,76,72,217,223,223,159,117)
|
||||
IMAGE_DATA(88,160,103,85,250,214,142,110,233,97,129,24,212,97,158,145,23,218,146,30,22,249,48,22,139,81,99,99,35,53,52,52)
|
||||
IMAGE_DATA(112,196,24,230,68,45,136,147,26,31,154,141,227,53,198,216,60,27,71,14,140,171,106,99,14,26,246,30,117,253,121,69)
|
||||
IMAGE_DATA(98,14,26,191,94,247,249,34,125,164,207,165,183,233,55,219,126,182,221,47,44,198,116,63,218,208,185,207,125,84,185,143)
|
||||
IMAGE_DATA(8,17,42,2,81,195,70,168,40,212,184,143,32,209,126,249,34,181,95,190,64,86,250,54,115,61,128,239,152,246,206,114)
|
||||
IMAGE_DATA(212,247,249,213,249,103,126,153,7,19,255,162,223,66,252,235,252,74,223,75,252,218,248,151,225,70,114,146,156,163,251,223)
|
||||
IMAGE_DATA(235,247,65,57,168,154,87,197,203,192,143,11,197,213,66,125,1,27,195,123,172,118,203,27,20,55,75,166,54,39,55,43)
|
||||
IMAGE_DATA(20,87,125,26,217,167,179,49,34,207,127,196,57,44,187,227,233,174,101,118,49,33,145,205,178,240,5,239,117,151,163,106)
|
||||
IMAGE_DATA(255,87,107,11,232,186,204,180,75,109,12,231,234,126,85,126,115,255,154,133,48,73,104,106,44,168,133,201,229,211,252,140)
|
||||
IMAGE_DATA(58,234,46,69,30,11,97,123,46,21,114,142,5,61,191,7,197,66,148,210,88,88,11,204,163,192,83,235,238,107,197,169)
|
||||
IMAGE_DATA(165,122,173,62,181,238,247,185,193,239,245,75,169,9,90,78,79,210,202,210,52,221,90,78,210,234,202,44,173,175,206,211)
|
||||
IMAGE_DATA(198,218,2,109,174,167,105,107,115,137,110,111,221,162,204,246,26,237,100,54,233,159,157,219,180,187,187,67,119,238,236,238)
|
||||
IMAGE_DATA(221,204,3,77,136,255,48,104,105,174,167,159,91,191,163,206,88,35,245,116,181,82,252,183,118,26,232,239,166,145,161,56)
|
||||
IMAGE_DATA(253,245,231,32,77,36,174,209,244,84,130,230,102,166,41,181,56,71,43,203,105,218,216,88,163,76,102,59,4,135,229,159)
|
||||
IMAGE_DATA(176,60,215,176,202,77,89,57,9,139,178,134,149,245,145,15,200,26,222,227,62,216,193,170,252,101,193,247,135,211,19,39)
|
||||
IMAGE_DATA(227,164,98,165,199,187,75,145,243,11,76,22,188,32,197,51,80,233,207,172,41,100,207,238,13,249,238,45,249,217,23,78)
|
||||
IMAGE_DATA(145,159,128,56,230,222,195,143,184,107,123,72,26,224,15,100,176,29,19,89,251,152,115,220,121,192,57,102,124,57,43,29)
|
||||
IMAGE_DATA(164,64,169,125,49,236,123,225,24,249,51,71,228,175,48,68,254,10,67,228,79,93,215,164,78,190,254,10,57,199,89,205)
|
||||
IMAGE_DATA(160,253,153,106,85,245,194,240,103,227,81,172,21,150,63,147,152,98,213,9,34,78,166,101,122,19,20,43,78,230,81,165)
|
||||
IMAGE_DATA(43,37,253,30,203,221,95,185,95,223,92,30,85,218,82,197,137,49,97,250,51,137,17,227,194,242,103,234,77,140,13,195)
|
||||
IMAGE_DATA(159,173,55,127,124,208,254,242,245,102,131,124,253,133,133,200,95,97,136,252,21,134,200,95,97,168,4,127,50,148,218,87)
|
||||
IMAGE_DATA(24,168,125,220,57,238,60,228,28,115,170,237,255,229,227,127,1,213,69,47,215,102,80,125,169,82,141,151,26,145,223,96)
|
||||
IMAGE_DATA(17,249,13,22,145,223,96,81,46,126,77,207,249,98,249,45,228,190,194,106,133,237,215,84,107,82,63,44,191,54,158,253)
|
||||
IMAGE_DATA(49,165,244,107,18,35,234,75,237,55,87,156,76,203,244,38,48,241,107,147,39,151,103,149,46,31,170,252,30,228,188,185)
|
||||
IMAGE_DATA(114,151,99,63,228,242,172,210,170,226,114,249,181,201,99,26,39,198,148,210,175,73,76,161,117,138,229,215,212,171,24,91)
|
||||
IMAGE_DATA(10,191,182,94,253,241,97,251,205,215,171,13,138,229,55,44,68,126,131,69,228,55,88,68,126,131,69,37,250,245,67,55)
|
||||
IMAGE_DATA(126,144,240,47,154,224,210,250,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(1568, 42)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,150,223,75,2,65,16,199,183,196,126,188,22,245,247,250,111,4,61,24,244,16,20,36,20,244,22,66,65,16)
|
||||
IMAGE_DATA(20,101,101,26,234,233,101,154,89,98,89,47,33,92,59,171,35,59,227,221,37,62,89,59,123,124,112,119,190,223,187,61)
|
||||
IMAGE_DATA(119,103,111,87,45,171,53,149,208,151,93,82,169,84,96,163,88,129,88,58,157,38,216,190,48,157,251,196,35,158,89,240)
|
||||
IMAGE_DATA(168,105,23,64,54,155,37,240,5,192,117,238,19,143,120,102,193,35,11,64,60,78,123,212,162,94,2,113,11,32,46,241)
|
||||
IMAGE_DATA(127,235,8,159,49,235,26,48,245,151,64,206,130,226,249,15,30,217,10,197,227,180,71,22,128,120,156,246,56,117,22,140)
|
||||
IMAGE_DATA(26,12,64,206,130,226,113,218,35,91,161,120,156,246,200,2,16,143,211,30,57,11,14,145,179,160,120,156,246,232,47,193)
|
||||
IMAGE_DATA(162,154,211,87,82,95,60,241,57,179,178,162,227,80,11,195,63,20,81,198,86,243,48,198,227,65,72,60,136,136,71,249)
|
||||
IMAGE_DATA(227,158,79,223,39,228,165,227,110,136,235,36,238,197,162,254,204,164,207,167,101,108,148,151,212,186,154,215,87,82,173,154)
|
||||
IMAGE_DATA(246,73,54,19,28,29,108,7,123,59,27,6,168,67,12,53,192,175,222,5,237,151,170,1,234,24,7,47,180,191,62,219)
|
||||
IMAGE_DATA(132,195,204,214,232,153,112,79,239,163,69,216,223,221,28,245,7,254,247,110,147,128,26,234,221,206,19,129,235,157,183,71)
|
||||
IMAGE_DATA(2,215,95,219,53,2,215,219,45,143,192,245,214,115,133,192,245,102,163,68,224,122,163,254,64,224,122,221,47,16,184,238)
|
||||
IMAGE_DATA(215,242,4,174,215,188,91,2,215,189,114,142,192,245,74,233,154,192,245,226,253,57,193,214,97,126,239,114,167,4,156,95)
|
||||
IMAGE_DATA(204,143,171,139,99,2,230,7,230,17,180,225,30,0,234,24,255,45,63,245,146,28,36,115,130,37,115,88,18,223,220,156)
|
||||
IMAGE_DATA(25,236,228,133,118,217,203,27,160,142,29,21,138,151,163,56,212,177,115,140,33,18,159,60,94,169,14,176,227,48,182,85)
|
||||
IMAGE_DATA(157,208,0,142,51,206,139,239,231,13,56,47,81,243,24,53,239,227,159,190,164,201,150,132,102,133,100,11,207,20,40,118)
|
||||
IMAGE_DATA(150,216,5,51,164,215,235,154,54,252,226,191,177,139,203,177,126,255,155,196,248,88,133,141,105,216,216,135,205,145,217,191)
|
||||
IMAGE_DATA(236,34,251,151,236,95,127,117,255,250,1,96,153,229,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(544, 22)
|
||||
IMAGE_DATA(120,156,237,90,221,106,83,65,16,222,38,68,83,188,83,244,9,188,241,89,188,84,95,196,107,149,188,134,160,16,193,139)
|
||||
IMAGE_DATA(162,133,20,42,244,78,2,10,130,162,104,127,98,43,109,114,114,236,143,105,108,73,141,222,72,97,221,217,102,14,59,147)
|
||||
IMAGE_DATA(179,123,146,94,197,238,204,240,113,118,103,190,179,63,179,179,103,247,226,168,178,170,168,57,85,82,32,218,72,146,36,186)
|
||||
IMAGE_DATA(94,175,107,95,185,217,108,18,52,26,13,11,53,109,67,250,195,131,12,135,79,111,102,24,107,8,122,193,151,243,202,238)
|
||||
IMAGE_DATA(104,160,142,152,126,68,78,153,52,116,217,104,217,40,202,226,194,99,125,239,206,237,12,80,71,123,237,225,125,237,10,212)
|
||||
IMAGE_DATA(145,159,39,216,198,121,124,161,254,66,227,188,120,19,170,170,43,102,74,42,91,234,117,143,162,188,240,40,202,35,143,162)
|
||||
IMAGE_DATA(220,245,40,202,45,143,162,40,143,78,250,126,81,255,69,227,47,154,127,40,126,38,212,85,155,67,24,236,73,5,26,128)
|
||||
IMAGE_DATA(78,96,32,48,88,152,16,76,26,158,80,7,59,248,177,179,139,202,157,70,212,188,186,78,182,42,72,173,86,211,46,20)
|
||||
IMAGE_DATA(19,176,241,239,180,203,203,243,115,158,112,132,51,11,156,108,3,148,204,119,71,54,128,112,98,227,152,131,118,62,120,2)
|
||||
IMAGE_DATA(132,18,191,168,35,108,99,86,124,190,96,0,206,125,20,242,251,60,255,18,112,63,231,9,71,56,179,192,145,187,160,112)
|
||||
IMAGE_DATA(162,230,200,6,16,78,212,156,168,238,130,161,128,200,93,80,56,81,115,228,40,20,78,212,28,217,0,194,137,154,19,213)
|
||||
IMAGE_DATA(93,208,23,12,128,220,5,133,19,53,71,142,66,225,68,205,145,13,32,156,168,57,114,23,28,65,238,130,194,137,154,99)
|
||||
IMAGE_DATA(127,237,157,51,90,49,202,19,159,99,86,118,116,8,234,210,104,66,30,25,219,205,35,27,183,235,28,187,246,216,125,252)
|
||||
IMAGE_DATA(80,251,116,60,57,131,14,189,16,234,36,52,48,223,100,38,109,159,202,88,148,171,234,134,42,25,173,168,107,182,254,166)
|
||||
IMAGE_DATA(185,164,87,150,159,219,223,174,1,80,6,27,250,0,105,178,161,251,135,137,5,148,209,14,92,168,255,249,221,39,120,181)
|
||||
IMAGE_DATA(244,44,107,19,222,25,254,234,17,52,94,62,201,250,3,254,201,224,128,0,125,232,31,28,239,17,112,255,241,209,119,2)
|
||||
IMAGE_DATA(238,255,217,239,18,112,127,191,215,33,224,254,222,143,54,1,247,31,236,111,19,112,255,254,238,55,2,238,223,77,55,9)
|
||||
IMAGE_DATA(184,63,237,182,8,184,191,219,89,39,224,254,206,206,42,1,247,183,183,191,16,112,255,214,215,247,4,174,31,214,119,99)
|
||||
IMAGE_DATA(245,45,1,174,47,230,199,231,143,175,9,48,63,48,143,160,14,239,0,160,140,246,162,252,52,91,242,44,153,203,44,153)
|
||||
IMAGE_DATA(243,146,120,109,237,157,133,155,188,80,223,233,180,44,160,140,29,109,110,125,202,236,80,198,206,209,134,16,251,228,246,118)
|
||||
IMAGE_DATA(114,6,215,14,177,77,76,66,3,48,206,184,46,105,218,178,192,117,241,173,163,111,221,199,63,125,21,155,45,240,215,241)
|
||||
IMAGE_DATA(85,146,45,60,83,64,220,44,113,5,51,100,56,28,216,58,60,113,54,174,196,108,59,61,253,75,108,60,86,121,49,205)
|
||||
IMAGE_DATA(139,125,222,26,217,243,203,21,57,191,228,252,250,95,207,175,127,223,64,121,37,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(736, 33)
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ void ToolBar::Post(Event<Bar&> bar)
|
|||
int ToolBar::GetStdHeight()
|
||||
{
|
||||
Size sz = StyleDefault().maxiconsize;
|
||||
return sz.cy > 10000 ? 22 + 3 : sz.cy + 6 + 3;
|
||||
return sz.cy > 10000 ? DPI(22) + 3 : sz.cy + DPI(6) + 3;
|
||||
}
|
||||
|
||||
StaticBarArea::StaticBarArea()
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Rect LayDes::CtrlRectZ(Ctrl::LogPos pos, Size sz)
|
|||
|
||||
void LayDes::AddHandle(Draw& w, int x, int y)
|
||||
{
|
||||
w.DrawRect(x, y, 6, 6, SColorMark);
|
||||
w.DrawRect(x, y, DPI(6), DPI(6), SColorMark);
|
||||
handle.Add(Point(x, y));
|
||||
}
|
||||
|
||||
|
|
@ -111,10 +111,12 @@ void LayDes::GetSprings(Rect& l, Rect& t, Rect& r, Rect& b)
|
|||
Rect ir = CtrlRectZ(CurrentItem().pos, CurrentLayout().size);
|
||||
int h4 = ir.Height() / 4;
|
||||
int w4 = ir.Width() / 4;
|
||||
l = RectC(-MARGIN, ir.top + h4 - 5, ir.left + MARGIN, 10);
|
||||
t = RectC(ir.left + w4 - 5, -MARGIN, 10, ir.top + MARGIN);
|
||||
r = RectC(ir.right, ir.bottom - h4 - 5, 9999, 10);
|
||||
b = RectC(ir.right - w4 - 5, ir.bottom, 10, 9999);
|
||||
int fv = DPI(5);
|
||||
int tn = DPI(10);
|
||||
l = RectC(-MARGIN, ir.top + h4 - fv, ir.left + MARGIN, tn);
|
||||
t = RectC(ir.left + w4 - fv, -MARGIN, tn, ir.top + MARGIN);
|
||||
r = RectC(ir.right, ir.bottom - h4 - fv, 9999, tn);
|
||||
b = RectC(ir.right - w4 - fv, ir.bottom, tn, 9999);
|
||||
}
|
||||
|
||||
void LayDes::DrawSpring(Draw& w, const Rect& r, bool horz, bool hard)
|
||||
|
|
@ -195,7 +197,7 @@ void LayDes::Paint(Draw& w)
|
|||
Size sz = GetSize();
|
||||
w.DrawRect(sz, SColorPaper);
|
||||
if(!IsNull(fileerror))
|
||||
w.DrawText(16, 16, "FILE ERROR: " + fileerror, Arial(14).Bold(), Red);
|
||||
w.DrawText(16, 16, "FILE ERROR: " + fileerror, ArialZ(14).Bold(), Red);
|
||||
if(IsNull(currentlayout))
|
||||
return;
|
||||
w.Offset(-sb.Get());
|
||||
|
|
@ -212,8 +214,8 @@ void LayDes::Paint(Draw& w)
|
|||
}
|
||||
DrawFrame(w, -1, -1, lsz.cx + 2, lsz.cy + 2, SColorText);
|
||||
handle.Clear();
|
||||
AddHandle(w, lsz.cx, lsz.cy / 2 - 3);
|
||||
AddHandle(w, lsz.cx / 2 - 3, lsz.cy);
|
||||
AddHandle(w, lsz.cx, lsz.cy / 2 - DPI(3));
|
||||
AddHandle(w, lsz.cx / 2 - DPI(3), lsz.cy);
|
||||
AddHandle(w, lsz.cx, lsz.cy);
|
||||
int i;
|
||||
Index<int> passed;
|
||||
|
|
@ -228,16 +230,16 @@ void LayDes::Paint(Draw& w)
|
|||
for(i = 0; i < cursor.GetCount(); i++) {
|
||||
LayoutItem& m = l.item[cursor[i]];
|
||||
Rect r = CtrlRectZ(m.pos, l.size);
|
||||
DrawFatFrame(w, r, i == cursor.GetCount() - 1 ? Cyan : Brown, -3);
|
||||
DrawFatFrame(w, r, i == cursor.GetCount() - 1 ? Cyan : Brown, DPI(-3));
|
||||
if(i == cursor.GetCount() - 1) {
|
||||
int lrm = r.left + r.Width() / 2 - 3;
|
||||
int tbm = r.top + r.Height() / 2 - 3;
|
||||
AddHandle(w, r.left - 6, r.top - 6);
|
||||
AddHandle(w, lrm, r.top - 6);
|
||||
AddHandle(w, r.right, r.top - 6);
|
||||
AddHandle(w, r.left - 6, tbm);
|
||||
int lrm = r.left + r.Width() / 2 - DPI(3);
|
||||
int tbm = r.top + r.Height() / 2 - DPI(3);
|
||||
AddHandle(w, r.left - DPI(6), r.top - DPI(6));
|
||||
AddHandle(w, lrm, r.top - DPI(6));
|
||||
AddHandle(w, r.right, r.top - DPI(6));
|
||||
AddHandle(w, r.left - DPI(6), tbm);
|
||||
AddHandle(w, r.right, tbm);
|
||||
AddHandle(w, r.left - 6, r.bottom);
|
||||
AddHandle(w, r.left - DPI(6), r.bottom);
|
||||
AddHandle(w, lrm, r.bottom);
|
||||
AddHandle(w, r.right, r.bottom);
|
||||
}
|
||||
|
|
@ -287,7 +289,7 @@ int LayDes::FindHandle(Point p)
|
|||
{
|
||||
for(int i = 0; i < handle.GetCount(); i++) {
|
||||
Point h = handle[i];
|
||||
if(p.x >= h.x - 1 && p.x < h.x + 7 && p.y >= h.y - 1 && p.y < h.y + 7)
|
||||
if(p.x >= h.x - DPI(1) && p.x < h.x + DPI(7) && p.y >= h.y - DPI(1) && p.y < h.y + DPI(7))
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue