feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix Locator's file system filter.

Browse Source 
This always selected the whole filter text when entering a directory.
This commit is contained in:
con
2009-07-14 11:52:10 +02:00
parent e10c0c967a
commit c89e237d00
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/quickopen/filesystemfilter.cpp
View File

@@ -94,8 +94,8 @@ void FileSystemFilter::accept(FilterEntry selection) const
{
QFileInfo info(selection.internalData.toString());
if (info.isDir()) {
m_toolWindow->show(shortcutString()+" "
+QDir::toNativeSeparators(info.absoluteFilePath()+"/"));
QString value = shortcutString() + " " + QDir::toNativeSeparators(info.absoluteFilePath()+"/");
m_toolWindow->show(value, value.length());
return;
}
m_editorManager->openEditor(selection.internalData.toString());

9
src/plugins/quickopen/quickopentoolwindow.cpp
View File

@@ -345,8 +345,6 @@ bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event)
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusOut) {
m_completionList->hide();
} else if (obj == m_fileLineEdit && event->type() == QEvent::FocusIn) {
if (static_cast<QFocusEvent*>(event)->reason() != Qt::MouseFocusReason)
m_fileLineEdit->selectAll();
showPopup();
} else if (obj == this && event->type() == QEvent::ShortcutOverride) {
QKeyEvent *ke = static_cast<QKeyEvent *>(event);
@@ -445,10 +443,13 @@ void QuickOpenToolWindow::show(const QString &text, int selectionStart, int sele
else
showPopup();
if (selectionStart >= 0)
if (selectionStart >= 0) {
m_fileLineEdit->setSelection(selectionStart, selectionLength);
else
if (selectionLength == 0) // make sure the cursor is at the right position (Mac-vs.-rest difference)
m_fileLineEdit->setCursorPosition(selectionStart);
} else {
m_fileLineEdit->selectAll();
}
}
void QuickOpenToolWindow::filterSelected()