Diffstat (limited to 'inputmethods/dasher/QtDasherScreen.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/dasher/QtDasherScreen.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h index c4d3b59..c029a60 100644 --- a/inputmethods/dasher/QtDasherScreen.h +++ b/inputmethods/dasher/QtDasherScreen.h | |||
@@ -21,6 +21,8 @@ | |||
21 | #include "DashEdit.h" | 21 | #include "DashEdit.h" |
22 | #include "DasherInterface.h" | 22 | #include "DasherInterface.h" |
23 | 23 | ||
24 | #include <iconv.h> | ||
25 | |||
24 | using namespace Dasher; | 26 | using namespace Dasher; |
25 | 27 | ||
26 | class QtDasherScreen : public QWidget, public Dasher::CDasherScreen | 28 | class QtDasherScreen : public QWidget, public Dasher::CDasherScreen |
@@ -49,7 +51,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen | |||
49 | void TextSize(symbol Character, int* Width, int* Height, int Size) const | 51 | void TextSize(symbol Character, int* Width, int* Height, int Size) const |
50 | { | 52 | { |
51 | // should probably use QPainter::boundingRect() | 53 | // should probably use QPainter::boundingRect() |
52 | *Width = *Height = Fonts[Size].pixelSize(); | 54 | *Width = *Height = font.pixelSize(); |
53 | 55 | ||
54 | } | 56 | } |
55 | void DrawText(symbol Character, int x1, int y1, int Size) const | 57 | void DrawText(symbol Character, int x1, int y1, int Size) const |
@@ -58,7 +60,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen | |||
58 | // font.setPixelSize(Size); | 60 | // font.setPixelSize(Size); |
59 | QPoint point = QPoint(x1, y1+Size/2); | 61 | QPoint point = QPoint(x1, y1+Size/2); |
60 | 62 | ||
61 | painter->setFont (Fonts[Size]); | 63 | painter->setFont (font); |
62 | painter->drawText (point, | 64 | painter->drawText (point, |
63 | QString(interface->GetDisplayText(Character).c_str())); | 65 | QString(interface->GetDisplayText(Character).c_str())); |
64 | } | 66 | } |
@@ -71,7 +73,8 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen | |||
71 | 73 | ||
72 | std::vector<int> FontSizes; | 74 | std::vector<int> FontSizes; |
73 | std::vector<QFont> Fonts; | 75 | std::vector<QFont> Fonts; |
74 | 76 | QFont font; | |
77 | int fontsize; | ||
75 | void Blank() const { | 78 | void Blank() const { |
76 | painter->begin(pixmap); | 79 | painter->begin(pixmap); |
77 | painter->setPen (NoPen); | 80 | painter->setPen (NoPen); |