noham/archived-Reclass
1
0
Fork 0
mirror of https://github.com/NohamR/Reclass.git synced 2026-05-10 19:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix type picker popup cursor, sanitize string display

Browse Source 
- Use isListActive() to detect popup and force arrow cursor
- Remove broken widget-search hack from showTypeListFiltered()
- Escape \n \r \t and control chars in char[]/wchar_t[] display
This commit is contained in:
sysadmin
2026-02-04 09:28:12 -07:00
parent 5d24a5594f
commit 04252a3c96
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/editor.cpp
View File

@@ -1143,16 +1143,7 @@ void RcxEditor::showTypeListFiltered(const QString& filter) {
m_sci->SendScintilla(QsciScintillaBase::SCI_AUTOCSETSEPARATOR, (long)' '); m_sci->SendScintilla(QsciScintillaBase::SCI_AUTOCSETSEPARATOR, (long)' ');
m_sci->SendScintilla(QsciScintillaBase::SCI_USERLISTSHOW, m_sci->SendScintilla(QsciScintillaBase::SCI_USERLISTSHOW,
(uintptr_t)1, list.constData()); (uintptr_t)1, list.constData());
// Arrow cursor for popup is handled by applyHoverCursor() via isListActive()
// Set arrow cursor on the autocomplete popup (it defaults to pointing hand)
for (QObject* child : m_sci->children()) {
if (auto* w = qobject_cast<QWidget*>(child)) {
if (w->isVisible() && w->windowFlags() & Qt::Popup) {
w->setCursor(Qt::ArrowCursor);
break;
}
}
}
} }
void RcxEditor::updateTypeListFilter() { void RcxEditor::updateTypeListFilter() {
@@ -1248,6 +1239,17 @@ void RcxEditor::applyHoverCursor() {
return; return;
} }
// If autocomplete/user list popup is active, use arrow cursor
if (m_sci->isListActive()) {
if (!m_cursorOverridden) {
QApplication::setOverrideCursor(Qt::ArrowCursor);
m_cursorOverridden = true;
} else {
QApplication::changeOverrideCursor(Qt::ArrowCursor);
}
return;
}
int line; EditTarget t; int line; EditTarget t;
bool tokenHit = hitTestTarget(m_sci, m_meta, m_lastHoverPos, line, t, m_layout.nameW); bool tokenHit = hitTestTarget(m_sci, m_meta, m_lastHoverPos, line, t, m_layout.nameW);

17
src/format.cpp
View File

@@ -107,6 +107,21 @@ QString fmtStructFooter(const Node& node, int depth, int totalSize) {
static inline bool isAsciiPrintable(uint8_t c) { return c >= 0x20 && c <= 0x7E; } static inline bool isAsciiPrintable(uint8_t c) { return c >= 0x20 && c <= 0x7E; }
// Escape control characters for display
static QString sanitizeString(const QString& s) {
QString out;
out.reserve(s.size() + 8);
for (QChar c : s) {
if (c == '\n') out += QStringLiteral("\\n");
else if (c == '\r') out += QStringLiteral("\\r");
else if (c == '\t') out += QStringLiteral("\\t");
else if (c == '\\') out += QStringLiteral("\\\\");
else if (c < QChar(0x20)) out += QStringLiteral("\\x") + QString::number(c.unicode(), 16);
else out += c;
}
return out;
}
static QString bytesToAscii(const QByteArray& b, int slot) { static QString bytesToAscii(const QByteArray& b, int slot) {
QString out; QString out;
out.reserve(slot); out.reserve(slot);
@@ -189,6 +204,7 @@ static QString readValueImpl(const Node& node, const Provider& prov,
int end = bytes.indexOf('\0'); int end = bytes.indexOf('\0');
if (end >= 0) bytes.truncate(end); if (end >= 0) bytes.truncate(end);
QString s = QString::fromUtf8(bytes); QString s = QString::fromUtf8(bytes);
if (display) s = sanitizeString(s);
return display ? (QStringLiteral("\"") + s + QStringLiteral("\"")) : s; return display ? (QStringLiteral("\"") + s + QStringLiteral("\"")) : s;
} }
case NodeKind::UTF16: { case NodeKind::UTF16: {
@@ -197,6 +213,7 @@ static QString readValueImpl(const Node& node, const Provider& prov,
bytes.size() / 2); bytes.size() / 2);
int end = s.indexOf(QChar(0)); int end = s.indexOf(QChar(0));
if (end >= 0) s.truncate(end); if (end >= 0) s.truncate(end);
if (display) s = sanitizeString(s);
return display ? (QStringLiteral("L\"") + s + QStringLiteral("\"")) : s; return display ? (QStringLiteral("L\"") + s + QStringLiteral("\"")) : s;
} }
default: default: