git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'remotes/origin/pootle-import'
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index b5523d31bda5abfda22e2d9cdfa8840da4eeaddf..b8554d582c1b72f6788002509a36ae3c6a4f698d 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-172,11
+172,11
@@
int main(int argc, char **argv)
eTextPara::forceReplacementGlyph(i);
eWidgetDesktop dsk(eSize(720, 576));
eTextPara::forceReplacementGlyph(i);
eWidgetDesktop dsk(eSize(720, 576));
- eWidgetDesktop dsk_lcd(
eSize(132, 64
));
-
+ eWidgetDesktop dsk_lcd(
my_lcd_dc->size(
));
+
dsk.setStyleID(0);
dsk.setStyleID(0);
- dsk_lcd.setStyleID(1);
-
+ dsk_lcd.setStyleID(
my_lcd_dc->size().width() == 96 ? 2 :
1);
+
/* if (double_buffer)
{
eDebug(" - double buffering found, enable buffered graphics mode.");
/* if (double_buffer)
{
eDebug(" - double buffering found, enable buffered graphics mode.");
@@
-319,7
+319,7
@@
const char *getEnigmaVersionString()
#ifdef ENIGMA2_BRANCH
ENIGMA2_BRANCH;
#else
#ifdef ENIGMA2_BRANCH
ENIGMA2_BRANCH;
#else
- "HEAD"
+ "HEAD"
;
#endif
return std::string(date + '-' + branch).c_str();
}
#endif
return std::string(date + '-' + branch).c_str();
}