Commit Graph

343 Commits

Author SHA1 Message Date
Jief L
73411bbc47 Cleaning in XString. Some method renaming. 2020-04-23 23:43:35 +03:00
Jief L
fd0f4589ec New implementation of XString. 2020-04-23 16:20:48 +03:00
SergeySlice
16806d435f demo other linux
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-23 14:36:35 +03:00
SergeySlice
574cc3261c Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-23 12:08:23 +03:00
SergeySlice
01f33f7552 detect unknown linux versions,
stylish change: remove space between func and brace

Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-23 12:08:10 +03:00
asava
1ec5726f01 Move AnimeRun, LastDraw, CurrentFrame to FILM 2020-04-23 11:42:18 +03:00
jief
978e35845a Crash in DBG. 2020-04-23 11:07:05 +03:00
asava
f764a27a9a Correct proportional font 2020-04-22 02:27:01 +03:00
asava
92936b6987 Fix typo in previous commit 2020-04-21 22:18:58 +03:00
asava
2c65cd53f7 Restructuring of GetIcon/GetIconAlt/FillByDir, hopefully cover all cases now 2020-04-21 21:41:35 +03:00
SergeySlice
50faf1ae0a dont decolorize background under gray icon
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-21 19:27:30 +03:00
SergeySlice
d91781b79e repaired NonSelectedGray and inline badges
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-21 18:57:47 +03:00
asava
2aca7f3ec3 Correct getting of embedded icons in case icon not loaded 2020-04-21 03:39:49 +03:00
Sergey Isakov
e37d782aad VS2019 compatibility
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-20 15:45:25 +03:00
asava
2ec6b3f905 Correct background on resolution change & eliminate redundant calls 2020-04-20 03:55:35 +03:00
asava
f280ab3323 Correct mistake in XImage::CopyScaled 2020-04-20 02:12:43 +03:00
SergeySlice
d0d27d8e3d ceoorect banner position in vector theme
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-19 18:40:08 +03:00
SergeySlice
0ff64f4248 exclude extra debug messages
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-19 14:28:14 +03:00
SergeySlice
2a731df6e4 fix vector theme appearance
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-04-19 14:23:23 +03:00
asava
73f5205891 Another fail-safe check 2020-04-18 22:11:50 +03:00
asava
ea58107509 Add some fail-safe checks to XImage and XTheme 2020-04-18 12:46:52 +03:00
Sergey Isakov
1248bf2c71 use embedded icon with same id if theme native absent
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-18 09:39:47 +03:00
asava
11b6542852 Restrict SemiWhite pixel for dark embedded theme & allow embedded theme properties also when starting with other themes 2020-04-17 17:50:31 +03:00
asava
bda0beecd0 Choose best console mode first by height, then width 2020-04-17 17:12:14 +03:00
jief
4faa0aa8a2 Fix %X and %u format for char and short. 2020-04-17 16:14:24 +03:00
jief
647955dd8c Fix %x format for char and short. 2020-04-17 15:27:38 +03:00
Sergey Isakov
e1345d7ba0 cleanup from EG_IMAGE, they remain in separate drivers/protocols
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-17 15:21:15 +03:00
Sergey Isakov
79af8de0a0 separated EG_IMAGE to exclude them
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-16 14:42:14 +03:00
asava
509981b16c Add missing load for some png images 2020-04-16 14:36:51 +03:00
asava
f86e36a7e5 Correct theme Daylight, DarkEmbedded, some other theme issues 2020-04-16 14:04:24 +03:00
jief
e429268dfc Remove functions prototypes from Plateform.h 2020-04-16 10:15:26 +03:00
Sergey Isakov
36b908900a cleanup anime for xcinema
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-16 07:45:53 +03:00
jief
71562cf66a Swicth Cursor to UINTN to conform renderSVGtext. 2020-04-16 00:04:33 +03:00
asava
6e1f5206b8 Correct theme change, correct vector theme assignment 2020-04-15 23:12:43 +03:00
Sergey Isakov
8b3233bb34 fix crash with vector themes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-15 22:18:53 +03:00
Sergey Isakov
631a024373 refactoring anime into xcinema
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-15 19:30:39 +03:00
Sergey Isakov
0733b704ff avoid memory leak at sound play
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-15 12:13:51 +03:00
jief
42c8292445 Optimization of XString initialisation. 2020-04-14 22:49:45 +03:00
jief
e471eb744a Make Id protected in XCinema 2020-04-14 22:37:44 +03:00
Sergey Isakov
c32de7f2d2 draft xcinema to be replacement for GUI_ANIME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-14 19:52:13 +03:00
jief
807e36c427 GetIcon memory leak. 2020-04-14 10:33:02 +03:00
jief
73627c52cc Switch egScreenDescription() to XString 2020-04-14 10:27:23 +03:00
Sergey Isakov
12d9715a1c a template for refactoring ANIME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-13 22:01:40 +03:00
Sergey Isakov
12990aacd1 repair background scaling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-12 21:53:27 +03:00
Sergey Isakov
de181aecfb change background of embedded theme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-11 23:08:03 +03:00
Sergey Isakov
3433041756 use char8 for KPATIConnectorsController
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-11 18:36:40 +03:00
Jief L
84f956714f Some prototypes cleaning. 2020-04-11 09:21:06 +03:00
Sergey Isakov
ba80bb4f4d use embedded logo, drive image priorities changed
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 22:29:51 +03:00
Sergey Isakov
6039faefa2 improve oem string, refactor font name
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 20:00:37 +03:00
Sergey Isakov
3ef56cd78d improve smbios information
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 17:35:24 +03:00
Jief L
6d54a4c0b6 Get rid of AsciiPrintf used with %d 2020-04-10 15:35:25 +03:00
Sergey Isakov
84a320ba5d big cleanup to XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 13:04:21 +03:00
Sergey Isakov
d74b431b6f repaired system info
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 10:15:36 +03:00
Sergey Isakov
92ecdbf630 repair vector themes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-10 06:11:00 +03:00
Sergey Isakov
fd2547c281 safe draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 21:04:35 +03:00
Jief L
91b0145ab9 Disable automatic conversion of XString to wchar_t*. 2020-04-09 19:32:46 +03:00
Sergey Isakov
97d1d23eb0 repaired font handling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 16:04:12 +03:00
Sergey Isakov
790fedbdc6 initial support for cinema
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 09:04:21 +03:00
Sergey Isakov
13588fb67c allow triple os name like chrome,grub,linux
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 06:32:57 +03:00
Jief L
879b0c2961 DontStopAtPanic helper, XUINTN remove, PRIuPTR and few warnings. 2020-04-08 13:49:00 +03:00
Sergey Isakov
b245ea17d4 some cleanup
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 13:04:54 +03:00
Sergey Isakov
4be33ca401 correct codepage for help screen
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 12:45:36 +03:00
Sergey Isakov
91ba53fd1c fix compose, fix badge position
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 10:32:26 +03:00
Sergey Isakov
75427f2d83 refactoring text handling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-07 22:48:36 +03:00
Sergey Isakov
7635c0ca3b cache embedded images
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 15:26:16 +03:00
Sergey Isakov
3ba2ecd0fc use builtin icons when not theme provided
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 12:15:36 +03:00
Sergey Isakov
2971779ddf load os icons for legacy
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 00:14:27 +03:00
Sergey Isakov
ac789c25aa Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-05 18:55:38 +03:00
Sergey Isakov
4d9c1efd0c take optional os icons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 18:54:10 +03:00
Jief L
83cd92cb9f Remove floating point as bool warning. 2020-04-05 18:23:51 +03:00
Sergey Isakov
1c69fccb7a exclude InitSelection as it done during theme init
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 17:04:39 +03:00
Jief L
b8bb76d51e Refactor LoadOptions as XString. 2020-04-05 15:25:39 +03:00
Jief L
16da915f82 Theme switching. 2020-04-05 09:44:47 +03:00
Sergey Isakov
317cf43107 cleanup messy menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 07:35:55 +03:00
Sergey Isakov
dc558d04aa resolve conflict between menu and menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 06:44:27 +03:00
Sergey Isakov
c163748486 resolve some conflicts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 20:05:57 +03:00
Sergey Isakov
26795329fe clean place under buttons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 20:02:30 +03:00
Jief L
1c1db57638 Get rid of UnicodeSPrint. 2020-04-04 16:50:13 +03:00
Jief L
3cac160b6d Put functions back in menu.cpp 2020-04-04 15:27:02 +03:00
Jief L
0449bb7335 Fixes after rename. 2020-04-04 13:13:34 +03:00
Sergey Isakov
314acac5ab reduce messages
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 08:50:30 +03:00
Sergey Isakov
f638ad999a correct add legacy entry
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 06:46:41 +03:00
Sergey Isakov
f61d46411b x,y have to be signed int
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 05:59:17 +03:00
Sergey Isakov
8b5ec83c6a refactoring menu entries
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-03 23:00:42 +03:00
Jief L
418b4f4cc3 Get SelectionImage to work. 2020-04-02 22:27:10 +03:00
Sergey Isakov
ddccb001e6 repair scroll position
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-02 17:03:58 +03:00
Sergey Isakov
0c6dc2f45e repair text draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-02 09:50:44 +03:00
Sergey Isakov
3ff4a9d730 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 21:03:26 +03:00
Sergey Isakov
5b84f64f61 pixel operations
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 20:07:57 +03:00
Sergey Isakov
5f037cc29a correct ximage compose
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 17:59:58 +03:00
Sergey Isakov
f70c4e14d2 refactoring DrawText and Pixels
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 15:57:32 +03:00
Jief L
0b19538bee Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-31 18:59:42 +03:00
Jief L
23b45d569a Get rid of XStringWP + few cleanings. 2020-03-31 18:59:35 +03:00
Sergey Isakov
a37196ab8c repair background draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-31 17:25:07 +03:00
Sergey Isakov
0c62865b22 eliminate mouse edge effect
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-31 15:35:04 +03:00
Jief L
2cb912ca74 Fix XImage assignment operator a better way. 2020-03-31 00:42:58 +03:00
Jief L
cdf5913c24 Fix XImage assignment operator in case other is empty. 2020-03-31 00:28:12 +03:00
Sergey Isakov
35103e3126 move data when create ximage from png
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 23:31:34 +03:00
Sergey Isakov
fb901fa1a0 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 18:53:11 +03:00
Sergey Isakov
6dc43d9d8e a possibility to use wchar in icon names
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 18:31:52 +03:00
Sergey Isakov
f7254f53e6 load icons as in xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 11:34:16 +03:00
asava
7e747613a9 Change arithmetics order to allow mouse movement in cases with high mouse resolution 2020-03-29 21:02:54 +03:00
Sergey Isakov
941244d894 merge conflict
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 19:19:08 +03:00
Sergey Isakov
4a541a5469 include parseXthem to xtheme class
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 19:17:27 +03:00
Jief L
e734530b9b Get rid of AsciiSPrint. 2020-03-29 16:44:08 +03:00
Jief L
3e58b71ea6 USE_XTHEME=0 for now. Cast in lodepng to avoid VS2017 warnings. 2020-03-29 14:42:17 +03:00
Jief L
b605d0d3bb Use size_t for Width and Height to conform eglodepng_decode prototype. 2020-03-29 13:35:09 +03:00
Jief L
22b9a6013b Fix compilation of getIcon methods 2020-03-29 13:19:05 +03:00
Jief L
6f46b07534 Operator _XS. Fix to VectorGraphics I've misunderstood. 2020-03-29 12:40:13 +03:00
Jief L
1eac7bacfb Some compile errors. 2020-03-29 12:06:34 +03:00
SergeySlice
6ca8e4426b some string corrections
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 11:07:59 +03:00
SergeySlice
443ad8ee3e dont commit USE_XTHEME
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 10:18:00 +03:00
SergeySlice
38319f70bc correct font handling
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 10:14:14 +03:00
Sergey Isakov
e59f205afc some comments around vector theme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 08:42:33 +03:00
SergeySlice
cf61a01b03 parse svg xtheme, not verified
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-28 21:34:23 +03:00
SergeySlice
ace46a5646 correct more variables
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-27 22:47:06 +03:00
Sergey Isakov
8f2c4b5efd separate data in global config
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 19:50:17 +03:00
Sergey Isakov
b74b57b7dd use local cycle index
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 10:46:04 +03:00
Sergey Isakov
381487d324 rewrite graphics menu style
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 08:54:41 +03:00
Sergey Isakov
01e8807236 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 23:35:12 +03:00
Sergey Isakov
b58bcf7270 more text procedures
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 23:32:31 +03:00
Sergey Isakov
8e42d69706 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-26 20:00:58 +03:00
Sergey Isakov
a65aa874a2 move types declarations
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 20:00:53 +03:00
Jief L
95f3123235 Remove PoolPrintFloat, adapt format litteral. 2020-03-26 19:49:10 +03:00
Sergey Isakov
9b85ac2a5b merge
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 17:25:49 +03:00
Sergey Isakov
1abcd07489 apply theme settings to xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 17:24:20 +03:00
Jief L
ee6124bd10 Bye bye PoolPrintFloat. 2020-03-26 15:59:20 +03:00
Sergey Isakov
a1d4a74efb update GUI settings for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 11:18:28 +03:00
Jief L
84306ecbd8 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-25 21:33:21 +03:00
Jief L
e8fd94bb8f Switch to new printf format for DebugLog. 2020-03-25 21:32:44 +03:00
Sergey Isakov
6db46bffc3 repair mouse events
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-25 21:22:34 +03:00
Sergey Isakov
4b1c81b7f9 repair scroll
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-25 20:49:01 +03:00
Sergey Isakov
91ab997f5f xtheme support is mostly working
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-24 18:17:12 +03:00
Sergey Isakov
446b3cc6f6 revert build_rule
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-24 07:36:39 +03:00
Sergey Isakov
a3f3053c30 rewrite render text
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-23 22:10:16 +03:00
Sergey Isakov
d7e93a96e5 adopt DrawMainMenu to XTheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-23 17:51:20 +03:00
Sergey Isakov
ddba966e94 advance menu codes for use xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-22 13:48:13 +03:00
Jief L
35e2eec3cc Some (not all) compilation issues fixed. 2020-03-21 14:43:45 +03:00
Sergey Isakov
9ec0c457f5 some advance in xtheme support
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-21 10:34:28 +03:00
Sergey Isakov
16947ddbe4 advance vector graphics for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 23:10:08 +03:00
Sergey Isakov
f1d136e013 make scrolls for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 20:48:19 +03:00
Sergey Isakov
054898eef3 implemented LoadXImage
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 21:35:58 +03:00
Sergey Isakov
c64788a19e improve setSizeInPixels
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 09:56:31 +03:00
Sergey Isakov
ce86d7f6b8 ensure image size
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 07:15:08 +03:00
SergeySlice
eac40c312e begin fill theme with images
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-18 17:11:56 +03:00
Sergey Isakov
2d82d317e3 init selections and buttons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-18 12:07:34 +03:00
jief
255c331069 Fix compilation. 2020-03-18 09:39:11 +03:00
SergeySlice
5ed385d3fa introduce loadImage
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-17 22:43:58 +03:00
Sergey Isakov
0eb9528089 some screen operations for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-17 07:25:38 +03:00
SergeySlice
81f2b91b15 clear screen in xtheme
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-16 22:47:02 +03:00