git-svn-id: svn://db.shs.com.ru/libs@471 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -167,6 +167,7 @@ void QCodeEdit::setDocument(QTextDocument * doc) {
|
|||||||
doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
|
doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
|
||||||
ui->textCode->setDocument(doc);
|
ui->textCode->setDocument(doc);
|
||||||
ui->textCode->setCursorWidth(qMax<int>(qRound(fontHeight() / 10.), 1));
|
ui->textCode->setCursorWidth(qMax<int>(qRound(fontHeight() / 10.), 1));
|
||||||
|
setShowSpaces(spaces_);
|
||||||
if (doc->property("_cursor").isValid()) {
|
if (doc->property("_cursor").isValid()) {
|
||||||
setTextCursor(doc->property("_cursor").value<QTextCursor>());
|
setTextCursor(doc->property("_cursor").value<QTextCursor>());
|
||||||
textEdit()->verticalScrollBar()->setValue(doc->property("_vpos").toInt());
|
textEdit()->verticalScrollBar()->setValue(doc->property("_vpos").toInt());
|
||||||
@@ -693,7 +694,12 @@ void QCodeEdit::searchAll() {
|
|||||||
|
|
||||||
|
|
||||||
void QCodeEdit::search_triggered() {
|
void QCodeEdit::search_triggered() {
|
||||||
QString st = ui->textCode->textCursor().selectedText();
|
QTextCursor tc = ui->textCode->textCursor();
|
||||||
|
QString st = tc.selectedText();
|
||||||
|
if (st.isEmpty()) {
|
||||||
|
tc.select(QTextCursor::WordUnderCursor);
|
||||||
|
st = tc.selectedText();
|
||||||
|
}
|
||||||
search(st);
|
search(st);
|
||||||
//QMetaObject::invokeMethod(ui->comboSearch->lineEdit(), "returnPressed");
|
//QMetaObject::invokeMethod(ui->comboSearch->lineEdit(), "returnPressed");
|
||||||
if (ui->comboSearch->findText(st) < 0)
|
if (ui->comboSearch->findText(st) < 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user