Commit 68b6a7f1 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed focus after command entry

parent c889a73c
...@@ -155,10 +155,6 @@ static void modifyBackground(QWidget* widget, QColor color) ...@@ -155,10 +155,6 @@ static void modifyBackground(QWidget* widget, QColor color)
void WNavQt::set_inputfocus(int focus) void WNavQt::set_inputfocus(int focus)
{ {
if (!displayed) {
return;
}
if (focus) { if (focus) {
modifyBackground(form_widget, QColor("Black")); modifyBackground(form_widget, QColor("Black"));
brow_widget->setFocus(); brow_widget->setFocus();
......
...@@ -1359,7 +1359,6 @@ void WttQtWidget::valchanged_cmd_entry() ...@@ -1359,7 +1359,6 @@ void WttQtWidget::valchanged_cmd_entry()
if (wtt->input_open) { if (wtt->input_open) {
switch (wtt->input_mode) { switch (wtt->input_mode) {
case wtt_eInputMode_Attribute: case wtt_eInputMode_Attribute:
wtt->input_wnav->select_object(wtt->input_node);
sts = wtt->input_wnav->set_attr_value(wtt->input_node, wtt->input_objid, sts = wtt->input_wnav->set_attr_value(wtt->input_node, wtt->input_objid,
qPrintableLatin1(wtt->cmd_entry->text())); qPrintableLatin1(wtt->cmd_entry->text()));
if (EVEN(sts)) { if (EVEN(sts)) {
...@@ -1367,7 +1366,6 @@ void WttQtWidget::valchanged_cmd_entry() ...@@ -1367,7 +1366,6 @@ void WttQtWidget::valchanged_cmd_entry()
} }
break; break;
case wtt_eInputMode_ObjectName: case wtt_eInputMode_ObjectName:
wtt->input_wnav->select_object(wtt->input_node);
sts = wtt->input_wnav->set_object_name(wtt->input_node, wtt->input_objid, sts = wtt->input_wnav->set_object_name(wtt->input_node, wtt->input_objid,
qPrintableLatin1(wtt->cmd_entry->text())); qPrintableLatin1(wtt->cmd_entry->text()));
if (EVEN(sts)) { if (EVEN(sts)) {
...@@ -1376,11 +1374,7 @@ void WttQtWidget::valchanged_cmd_entry() ...@@ -1376,11 +1374,7 @@ void WttQtWidget::valchanged_cmd_entry()
break; break;
default:; default:;
} }
if (wtt->input_open) {
wtt->cmd_entry->setVisible(false); wtt->cmd_entry->setVisible(false);
wtt->set_prompt("");
wtt->input_open = 0;
}
} else if (wtt->command_open) { } else if (wtt->command_open) {
if (!wtt->focused_wnav) { if (!wtt->focused_wnav) {
wtt->set_focus_default(); wtt->set_focus_default();
...@@ -2211,7 +2205,7 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name, ...@@ -2211,7 +2205,7 @@ WttQt::WttQt(void* wt_parent_ctx, QWidget* wt_parent_wid, const char* wt_name,
cmd_prompt = new QLabel(fl("value > ")); cmd_prompt = new QLabel(fl("value > "));
cmd_entry = new CoWowEntryQt(&cmd_recall); cmd_entry = new CoWowEntryQt(&cmd_recall);
cmd_entry->set_hide_on_esc(true); cmd_entry->set_hide_on_esc(true);
QObject::connect(cmd_entry, SIGNAL(editingFinished()), toplevel, QObject::connect(cmd_entry, SIGNAL(returnPressed()), toplevel,
SLOT(valchanged_cmd_entry())); SLOT(valchanged_cmd_entry()));
QObject::connect( QObject::connect(
cmd_entry, SIGNAL(hidden()), toplevel, SLOT(hide_cmd_entry())); cmd_entry, SIGNAL(hidden()), toplevel, SLOT(hide_cmd_entry()));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment