fix: static function bugs of DInputDialog

Change-Id: I9abf70820e5e1bce0dd45f590494641f95ac280d
linuxdeepin · Oct 29, 2018 · a34833e · a34833e
1 parent ed2f17e
commit a34833e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/widgets/dinputdialog.cpp b/src/widgets/dinputdialog.cpp
@@ -756,8 +756,9 @@ QString DInputDialog::getText(QWidget *parent, const QString &title, const QStri
     dialog.setTextValue(text);
     dialog.setWindowFlags(flags);
     dialog.setInputMethodHints(inputMethodHints);
+    dialog.setInputMode(InputMode::TextInput);
 
-    *ok = dialog.exec() == QDialog::Accepted;
+    ok ? *ok = dialog.exec() == QDialog::Accepted : dialog.exec();
 
     return dialog.textValue();
 }
@@ -788,8 +789,9 @@ QString DInputDialog::getItem(QWidget *parent, const QString &title, const QStri
     dialog.setMessage(message);
     dialog.setWindowFlags(flags);
     dialog.setInputMethodHints(inputMethodHints);
+    dialog.setInputMode(InputMode::ComboBox);
 
-    *ok = dialog.exec() == QDialog::Accepted;
+    ok ? *ok = dialog.exec() == QDialog::Accepted : dialog.exec();
 
     return dialog.textValue();
 }
@@ -819,8 +821,9 @@ int DInputDialog::getInt(QWidget *parent, const QString &title, const QString &m
     dialog.setTitle(title);
     dialog.setMessage(message);
     dialog.setWindowFlags(flags);
+    dialog.setInputMode(InputMode::IntInput);
 
-    *ok = dialog.exec() == QDialog::Accepted;
+    ok ? *ok = dialog.exec() == QDialog::Accepted : dialog.exec();
 
     return dialog.intValue();
 }
@@ -850,8 +853,9 @@ double DInputDialog::getDouble(QWidget *parent, const QString &title, const QStr
     dialog.setTitle(title);
     dialog.setMessage(message);
     dialog.setWindowFlags(flags);
+    dialog.setInputMode(InputMode::DoubleInput);
 
-    *ok = dialog.exec() == QDialog::Accepted;
+    ok ? *ok = dialog.exec() == QDialog::Accepted : dialog.exec();
 
     return dialog.doubleValue();
 }