git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic message catalog update
[enigma2.git]
/
main
/
enigma-gdi.cpp
diff --git
a/main/enigma-gdi.cpp
b/main/enigma-gdi.cpp
index 43c422f810932cc0c39e2488d798277140458f5f..144e2d3a658ff02b81a94c839309c2732dd3442b 100644
(file)
--- a/
main/enigma-gdi.cpp
+++ b/
main/enigma-gdi.cpp
@@
-54,7
+54,6
@@
int main()
init.setRunlevel(eAutoInitNumbers::main);
ePtr<gFBDC> my_dc;
gFBDC::getInstance(my_dc);
init.setRunlevel(eAutoInitNumbers::main);
ePtr<gFBDC> my_dc;
gFBDC::getInstance(my_dc);
-#if 1
gPainter p(my_dc);
gPainter p(my_dc);
@@
-68,7
+67,7
@@
int main()
pal[a | 0x10] = (0x111111 * a) | 0xFF;
p.setPalette(pal, 0, 256);
pal[a | 0x10] = (0x111111 * a) | 0xFF;
p.setPalette(pal, 0, 256);
- fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "
Arial
", 100);
+ fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "
Regular
", 100);
p.resetClip(gRegion(eRect(0, 0, 720, 576)));
p.resetClip(gRegion(eRect(0, 0, 720, 576)));
@@
-102,7
+101,7
@@
int main()
p.setBackgroundColor(gColor(0x1f));
p.setForegroundColor(gColor(0x10));
p.setBackgroundColor(gColor(0x1f));
p.setForegroundColor(gColor(0x10));
- ePtr<gFont> fnt = new gFont("
Arial
", 70);
+ ePtr<gFont> fnt = new gFont("
Regular
", 70);
p.setFont(fnt);
p.renderText(eRect(100, 100, 500, 200), "Hello welt!");
p.setFont(fnt);
p.renderText(eRect(100, 100, 500, 200), "Hello welt!");