closing a session returns keyboard to default better now

1 files changed, 8 insertions, 1 deletions

diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index ce65052..5f3b5ec 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -13,10 +13,13 @@
 #include <qcombobox.h>
 #include <qdir.h>
 
+#define DEFAULT_ROWS 2
+#define DEFAULT_COLS 11
+
 /* FunctionKeyboard {{{1 */
 
 FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
-    QFrame(parent), numRows(2), numCols(11),
+    QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS),
     pressedRow(0), pressedCol(0) {
 
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
@@ -223,6 +226,10 @@ QSize FunctionKeyboard::sizeHint() const {
 
 void FunctionKeyboard::loadDefaults() {
 
+    numRows = DEFAULT_ROWS;
+    numCols = DEFAULT_COLS;
+    keyWidth = (double)width()/numCols; // have to reset this thing too
+
     keys.insert( "r0c0", FKey ("Enter", "enter", Qt::Key_Enter, 0));
     keys.insert( "r0c1", FKey ("Space", "space", Qt::Key_Space, Qt::Key_Space));
     keys.insert( "r0c2", FKey ("Tab", "tab", Qt::Key_Tab, 0));