summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 89937cf..e3d3928 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -222,49 +222,51 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
222 QPixmap *pix = keys->pix(row, col); 222 QPixmap *pix = keys->pix(row, col);
223 int keyWidth = keys->width(row, col); 223 int keyWidth = keys->width(row, col);
224 224
225 225
226 int keyWidthPix = defaultKeyWidth * keyWidth; 226 int keyWidthPix = defaultKeyWidth * keyWidth;
227 227
228 if (keys->pressed(row, col)) 228 if (keys->pressed(row, col))
229 p.fillRect(x+1, y+1, keyWidthPix - 1, 229 p.fillRect(x+1, y+1, keyWidthPix - 1,
230 keyHeight - 1, keycolor_pressed); 230 keyHeight - 1, keycolor_pressed);
231 231
232 ushort c = keys->uni(row, col); 232 ushort c = keys->uni(row, col);
233 233
234 p.setPen(textcolor);
234 if (!pix) { 235 if (!pix) {
235 if ((shift || lock) && keys->shift(c)) 236 if ((shift || lock) && keys->shift(c))
236 c = keys->shift(c); 237 c = keys->shift(c);
237 else if (meta && keys->meta(c)) 238 else if (meta && keys->meta(c))
238 c = keys->meta(c); 239 c = keys->meta(c);
239 240
240 p.drawText(x, y, 241 p.drawText(x, y,
241 defaultKeyWidth * keyWidth + 3, keyHeight, 242 keyWidthPix + 3, keyHeight,
242 AlignCenter, (QChar)c); 243 AlignCenter, (QChar)c);
243 } 244 }
244 else { 245 else {
245 // center the image in the middle of the key 246 // center the image in the middle of the key
246 p.drawPixmap( x + (keyWidthPix - pix->width())/2, 247 p.drawPixmap( x + (keyWidthPix - pix->width())/2,
247 y + (keyHeight - pix->height())/2 + 1, 248 y + (keyHeight - pix->height())/2 + 1,
248 QPixmap(*pix) ); 249 QPixmap(*pix) );
249 } 250 }
250 251
251 p.setPen(keycolor_lines); 252 p.setPen(keycolor_lines);
252 p.drawLine(x, y, x, y + keyHeight); 253 p.drawLine(x, y, x, y + keyHeight);
253 254
254 x += keyWidthPix; 255 x += keyWidthPix;
255 } 256 }
256 257
257 258
258 } 259 }
260 p.setPen(keycolor_lines);
259 p.drawLine(0, height() - 1, width(), height() - 1); 261 p.drawLine(0, height() - 1, width(), height() - 1);
260 p.drawLine(width() - 1, 0, width() - 1, height()); 262 p.drawLine(width() - 1, 0, width() - 1, height());
261 } 263 }
262 264
263} 265}
264 266
265 267
266/* Keyboard::mousePressEvent {{{1 */ 268/* Keyboard::mousePressEvent {{{1 */
267void Keyboard::mousePressEvent(QMouseEvent *e) 269void Keyboard::mousePressEvent(QMouseEvent *e)
268{ 270{
269 int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1; 271 int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1;
270 if (row > 5) row = 5; 272 if (row > 5) row = 5;