diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-25 05:14:13 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-25 05:14:13 +0000 |
commit | 273b9d60502eb5b6c13cc773403fd51d9c7adf75 (patch) | |
tree | dd99f1e4afc17829210643744d1817fba632423c /utils/themeeditor/graphics/rbscreen.cpp | |
parent | 691d049177d646861a52e96146ad880d9dc18bbe (diff) | |
download | rockbox-273b9d60502eb5b6c13cc773403fd51d9c7adf75.tar.gz rockbox-273b9d60502eb5b6c13cc773403fd51d9c7adf75.zip |
Theme Editor: Fixed some compiler warnings and a segfault. Got some basic text rendering working (only with plaintext elements, no font support yet) as well as Viewport background color support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27126 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/graphics/rbscreen.cpp')
-rw-r--r-- | utils/themeeditor/graphics/rbscreen.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp index d37050b0b5..d6a9aa6240 100644 --- a/utils/themeeditor/graphics/rbscreen.cpp +++ b/utils/themeeditor/graphics/rbscreen.cpp | |||
@@ -32,10 +32,10 @@ RBScreen::RBScreen(const RBRenderInfo& info, QGraphicsItem *parent) : | |||
32 | width = info.settings()->value("#screenwidth", "300").toInt(); | 32 | width = info.settings()->value("#screenwidth", "300").toInt(); |
33 | height = info.settings()->value("#screenheight", "200").toInt(); | 33 | height = info.settings()->value("#screenheight", "200").toInt(); |
34 | 34 | ||
35 | QString bg = info.settings()->value("background color", "000000"); | 35 | QString bg = info.settings()->value("background color", "FFFFFF"); |
36 | bgColor = stringToColor(bg, Qt::white); | 36 | bgColor = stringToColor(bg, Qt::white); |
37 | 37 | ||
38 | QString fg = info.settings()->value("foreground color", "FFFFFF"); | 38 | QString fg = info.settings()->value("foreground color", "000000"); |
39 | fgColor = stringToColor(fg, Qt::black); | 39 | fgColor = stringToColor(fg, Qt::black); |
40 | 40 | ||
41 | settings = info.settings(); | 41 | settings = info.settings(); |
@@ -61,6 +61,8 @@ RBScreen::RBScreen(const RBRenderInfo& info, QGraphicsItem *parent) : | |||
61 | backdrop = 0; | 61 | backdrop = 0; |
62 | } | 62 | } |
63 | } | 63 | } |
64 | |||
65 | fonts.insert(0, new RBFont("Nothin'")); | ||
64 | } | 66 | } |
65 | 67 | ||
66 | RBScreen::~RBScreen() | 68 | RBScreen::~RBScreen() |