author | hash <hash> | 2002-08-27 07:41:59 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-27 07:41:59 (UTC) |
commit | 8760fbdfefe1b6c60400cdeee45a6ba892d40751 (patch) (unidiff) | |
tree | 50e8ad9d74c0332c5826a429abdeceb3142283b5 | |
parent | 2bd07423a53f1b564b898dc9cf4dfbd6f1e337da (diff) | |
download | opie-8760fbdfefe1b6c60400cdeee45a6ba892d40751.zip opie-8760fbdfefe1b6c60400cdeee45a6ba892d40751.tar.gz opie-8760fbdfefe1b6c60400cdeee45a6ba892d40751.tar.bz2 |
pixmaps centered better
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index c3ee8f3..92ea896 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -185,25 +185,25 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col) | |||
185 | if (shift || lock) | 185 | if (shift || lock) |
186 | c = keys->shift(c); | 186 | c = keys->shift(c); |
187 | if (meta) { | 187 | if (meta) { |
188 | 188 | ||
189 | c = keys->meta(c); | 189 | c = keys->meta(c); |
190 | } | 190 | } |
191 | p.drawText(x, y, | 191 | p.drawText(x, y, |
192 | defaultKeyWidth * keyWidth + 3, keyHeight, | 192 | defaultKeyWidth * keyWidth + 3, keyHeight, |
193 | AlignCenter, (QChar)c); | 193 | AlignCenter, (QChar)c); |
194 | } | 194 | } |
195 | else | 195 | else |
196 | // center the image in the middle of the key | 196 | // center the image in the middle of the key |
197 | p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2, | 197 | p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2 + 1, |
198 | y + (keyHeight - pix->height())/2 + 1, | 198 | y + (keyHeight - pix->height())/2 + 1, |
199 | *pix ); | 199 | *pix ); |
200 | 200 | ||
201 | // this fixes the problem that the very right end of the board's vertical line | 201 | // this fixes the problem that the very right end of the board's vertical line |
202 | // gets painted over, because it's one pixel shorter than all other keys | 202 | // gets painted over, because it's one pixel shorter than all other keys |
203 | p.setPen(keycolor_lines); | 203 | p.setPen(keycolor_lines); |
204 | p.drawLine(width() - 1, 0, width() - 1, height()); | 204 | p.drawLine(width() - 1, 0, width() - 1, height()); |
205 | 205 | ||
206 | } else { | 206 | } else { |
207 | 207 | ||
208 | 208 | ||
209 | p.fillRect(0, 0, width(), height(), keycolor); | 209 | p.fillRect(0, 0, width(), height(), keycolor); |
@@ -235,25 +235,25 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col) | |||
235 | if ((shift || lock) && keys->shift(c)) | 235 | if ((shift || lock) && keys->shift(c)) |
236 | c = keys->shift(c); | 236 | c = keys->shift(c); |
237 | else if (meta && keys->meta(c)) | 237 | else if (meta && keys->meta(c)) |
238 | c = keys->meta(c); | 238 | c = keys->meta(c); |
239 | 239 | ||
240 | p.drawText(x, y, | 240 | p.drawText(x, y, |
241 | keyWidthPix + 3, keyHeight, | 241 | keyWidthPix + 3, keyHeight, |
242 | AlignCenter, (QChar)c); | 242 | AlignCenter, (QChar)c); |
243 | } | 243 | } |
244 | else { | 244 | else { |
245 | // center the image in the middle of the key | 245 | // center the image in the middle of the key |
246 | pix->setColor(1, textcolor.rgb()); | 246 | pix->setColor(1, textcolor.rgb()); |
247 | p.drawImage( x + (keyWidthPix - pix->width())/2, | 247 | p.drawImage( x + (keyWidthPix - pix->width())/2 + 1, |
248 | y + (keyHeight - pix->height())/2 + 1, | 248 | y + (keyHeight - pix->height())/2 + 1, |
249 | QImage(*pix) ); | 249 | QImage(*pix) ); |
250 | } | 250 | } |
251 | 251 | ||
252 | p.setPen(keycolor_lines); | 252 | p.setPen(keycolor_lines); |
253 | p.drawLine(x, y, x, y + keyHeight); | 253 | p.drawLine(x, y, x, y + keyHeight); |
254 | 254 | ||
255 | x += keyWidthPix; | 255 | x += keyWidthPix; |
256 | } | 256 | } |
257 | 257 | ||
258 | 258 | ||
259 | } | 259 | } |