Diffstat (limited to 'inputmethods/multikey/keyboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 1dd8ca1..de3aa52 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -98,5 +98,5 @@ void Keyboard::resizeEvent(QResizeEvent*) | |||
98 | int ph = picks->sizeHint().height(); | 98 | int ph = picks->sizeHint().height(); |
99 | picks->setGeometry( 0, 0, width(), ph ); | 99 | picks->setGeometry( 0, 0, width(), ph ); |
100 | keyHeight = (height()-(usePicks ? ph : 0))/keys->rows(); | 100 | keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1); |
101 | 101 | ||
102 | int nk; // number of keys? | 102 | int nk; // number of keys? |
@@ -1322,4 +1322,7 @@ Keys::Keys() { | |||
1322 | 1322 | ||
1323 | } | 1323 | } |
1324 | if (map.isNull() || !(QFile(map).exists())) { | ||
1325 | map = QPEApplication::qpeDir() + "/share/multikey/en.keymap"; | ||
1326 | } | ||
1324 | 1327 | ||
1325 | setKeysFromFile(map); | 1328 | setKeysFromFile(map); |