luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the QT4 TextBox selection bug workaround. It prevents the selection method from working in some cases.

Browse source 
[GB.QT4]
* BUG: Remove the QT4 TextBox selection bug workaround. It prevents the selection method from working in some cases.

[GB.QT5]
* BUG: Remove the QT4 TextBox selection bug workaround. It prevents the selection method from working in some cases.
This commit is contained in:
gambas 2018-12-10 22:39:07 +01:00
parent b897cec6cf
commit 0706d6d170
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gb.qt4/src/CTextBox.cpp
View file

@ -83,7 +83,7 @@ BEGIN_METHOD(TextBox_new, GB_OBJECT parent)
QObject::connect(wid, SIGNAL(textChanged(const QString &)), &CTextBox::manager, SLOT(onChange())); QObject::connect(wid, SIGNAL(textChanged(const QString &)), &CTextBox::manager, SLOT(onChange()));
QObject::connect(wid, SIGNAL(returnPressed()), &CTextBox::manager, SLOT(onActivate())); QObject::connect(wid, SIGNAL(returnPressed()), &CTextBox::manager, SLOT(onActivate()));
QObject::connect(wid, SIGNAL(selectionChanged()), &CTextBox::manager, SLOT(onSelectionChanged())); //QObject::connect(wid, SIGNAL(selectionChanged()), &CTextBox::manager, SLOT(onSelectionChanged()));
wid->setAlignment(Qt::AlignLeft); wid->setAlignment(Qt::AlignLeft);
@ -113,7 +113,10 @@ BEGIN_PROPERTY(TextBox_Text)
if (READ_PROPERTY) if (READ_PROPERTY)
RETURN_NEW_STRING(TEXTBOX->text()); RETURN_NEW_STRING(TEXTBOX->text());
else else
{
TEXTBOX->deselect();
TEXTBOX->setText(QSTRING_PROP()); TEXTBOX->setText(QSTRING_PROP());
}
END_PROPERTY END_PROPERTY
@ -417,7 +420,10 @@ static void combo_set_text(CCOMBOBOX *_object, QString &text)
if (!COMBOBOX->isEditable() || pos >= 0) if (!COMBOBOX->isEditable() || pos >= 0)
combo_set_current_item(_object, pos); combo_set_current_item(_object, pos);
if (COMBOBOX->isEditable()) if (COMBOBOX->isEditable())
{
COMBOBOX->lineEdit()->deselect();
COMBOBOX->lineEdit()->setText(text); COMBOBOX->lineEdit()->setText(text);
}
} }
static void combo_set_editable(void *_object, bool ed) static void combo_set_editable(void *_object, bool ed)
@ -439,7 +445,7 @@ static void combo_set_editable(void *_object, bool ed)
COMBOBOX->setCompleter(0); COMBOBOX->setCompleter(0);
//CWidget::installFilter(COMBOBOX); //CWidget::installFilter(COMBOBOX);
QObject::connect(COMBOBOX->lineEdit(), SIGNAL(returnPressed()), &CTextBox::manager, SLOT(onActivate())); QObject::connect(COMBOBOX->lineEdit(), SIGNAL(returnPressed()), &CTextBox::manager, SLOT(onActivate()));
QObject::connect(COMBOBOX->lineEdit(), SIGNAL(selectionChanged()), &CTextBox::manager, SLOT(onSelectionChanged())); //QObject::connect(COMBOBOX->lineEdit(), SIGNAL(selectionChanged()), &CTextBox::manager, SLOT(onSelectionChanged()));
if (CWIDGET_test_flag(THIS, WF_DESIGN)) if (CWIDGET_test_flag(THIS, WF_DESIGN))
{ {
@ -813,7 +819,7 @@ void CTextBox::onClick()
} }
void CTextBox::onSelectionChanged(void) /*void CTextBox::onSelectionChanged(void)
{ {
GET_SENDER(); GET_SENDER();
GET_TEXT_BOX(); GET_TEXT_BOX();
@ -831,7 +837,7 @@ void CTextBox::onSelectionChanged(void)
{ {
get_selection(textbox, &THIS->start, &THIS->length); get_selection(textbox, &THIS->start, &THIS->length);
} }
} }*/

2
gb.qt4/src/CTextBox.h
View file

@ -104,7 +104,7 @@ public slots:
void onChange(void); void onChange(void);
void onActivate(void); void onActivate(void);
void onClick(void); void onClick(void);
void onSelectionChanged(void); //void onSelectionChanged(void);
}; };