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/rbviewport.h | |
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/rbviewport.h')
-rw-r--r-- | utils/themeeditor/graphics/rbviewport.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/utils/themeeditor/graphics/rbviewport.h b/utils/themeeditor/graphics/rbviewport.h index 29d0b0a373..5726c5c256 100644 --- a/utils/themeeditor/graphics/rbviewport.h +++ b/utils/themeeditor/graphics/rbviewport.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #define RBVIEWPORT_H | 23 | #define RBVIEWPORT_H |
24 | 24 | ||
25 | #include "skin_parser.h" | 25 | #include "skin_parser.h" |
26 | #include "rbfont.h" | ||
26 | 27 | ||
27 | class RBScreen; | 28 | class RBScreen; |
28 | class RBRenderInfo; | 29 | class RBRenderInfo; |
@@ -45,16 +46,21 @@ public: | |||
45 | void makeCustomUI(){ customUI = true; } | 46 | void makeCustomUI(){ customUI = true; } |
46 | void clearCustomUI(){ customUI = false; } | 47 | void clearCustomUI(){ customUI = false; } |
47 | 48 | ||
48 | 49 | void newLine(); | |
49 | void newline(); | 50 | void write(QString text); |
50 | 51 | ||
51 | private: | 52 | private: |
53 | |||
52 | QRectF size; | 54 | QRectF size; |
53 | QColor background; | 55 | QColor background; |
54 | QColor foreground; | 56 | QColor foreground; |
57 | RBFont* font; | ||
55 | 58 | ||
56 | bool customUI; | 59 | bool customUI; |
60 | QPoint textOffset; | ||
61 | int lineHeight; | ||
57 | 62 | ||
63 | RBScreen* screen; | ||
58 | }; | 64 | }; |
59 | 65 | ||
60 | #endif // RBVIEWPORT_H | 66 | #endif // RBVIEWPORT_H |