summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/function_keyboard.cpp4
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index fa11701..3da8d61 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -97,13 +97,13 @@ void FunctionKeyboard::paintEvent(QPaintEvent *e) {
97 keyWidth, keyHeight, 97 keyWidth, keyHeight,
98 Qt::AlignHCenter | Qt::AlignVCenter, 98 Qt::AlignHCenter | Qt::AlignVCenter,
99 keys[handle].label 99 keys[handle].label
100 ); 100 );
101 else { 101 else {
102 102
103 ushort centerX = c *keyWidth + (keyWidth - keys[handle].pix->width()) / 2; 103 ushort centerX = (ushort)(c *keyWidth) + (ushort)(keyWidth - keys[handle].pix->width()) / 2;
104 ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2; 104 ushort centerY = r * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
105 p.drawPixmap(centerX, centerY, *keys[handle].pix); 105 p.drawPixmap(centerX, centerY, *keys[handle].pix);
106 } 106 }
107 } 107 }
108 } 108 }
109 } 109 }
@@ -124,13 +124,13 @@ void FunctionKeyboard::paintKey(uint row, uint col) {
124 keyWidth, keyHeight, 124 keyWidth, keyHeight,
125 Qt::AlignHCenter | Qt::AlignVCenter, 125 Qt::AlignHCenter | Qt::AlignVCenter,
126 keys[handle].label 126 keys[handle].label
127 ); 127 );
128 else { 128 else {
129 129
130 ushort centerX = col *keyWidth + (keyWidth - keys[handle].pix->width()) / 2; 130 ushort centerX = (ushort)(col *keyWidth) + (ushort)(keyWidth - keys[handle].pix->width()) / 2;
131 ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2; 131 ushort centerY = row * keyHeight + (keyHeight - keys[handle].pix->height()) / 2;
132 p.drawPixmap(centerX, centerY, *keys[handle].pix); 132 p.drawPixmap(centerX, centerY, *keys[handle].pix);
133 } 133 }
134 134
135 if (col == numCols - 1) { 135 if (col == numCols - 1) {
136 136
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 406586c..b177fa5 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -558,13 +558,13 @@ void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
558 558
559 if (pressed) state = QEvent::KeyPress; 559 if (pressed) state = QEvent::KeyPress;
560 else state = QEvent::KeyRelease; 560 else state = QEvent::KeyRelease;
561 561
562 QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode))); 562 QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
563 563
564 // where should i send this event? doesnt work sending it here 564 // is this the best way to do this? cant figure out any other way to work
565 QApplication::sendEvent((QObject *)m_curSession->widget(), &ke); 565 QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
566 ke.ignore(); 566 ke.ignore();
567 } 567 }
568} 568}
569void MainWindow::slotCopy() { 569void MainWindow::slotCopy() {
570 if (!currentSession() ) return; 570 if (!currentSession() ) return;