Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix encoding issue in qt_sinks #2862

Merged
merged 6 commits into from
Sep 9, 2023
Merged

Fix encoding issue in qt_sinks #2862

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c46f9d
Fix encoding issue in qt_sinks
neothenil Aug 22, 2023
4a50f00
convert color ranges from byte index to character index before passin…
neothenil Aug 23, 2023
42609d4
make converted color ranges local variables
neothenil Aug 28, 2023
b5b9c7a
remove unnecessary QByteArray instance
neothenil Aug 31, 2023
4daba71
add is_utf8 in qt_color_sink
neothenil Sep 9, 2023
ad0d36f
fix argument order in qt_color_logger
neothenil Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions include/spdlog/sinks/qt_sinks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,23 @@ class qt_color_sink : public base_sink<Mutex>

const string_view_t str = string_view_t(formatted.data(), formatted.size());
// apply the color to the color range in the formatted message.
auto payload = QString::fromLatin1(str.data(), static_cast<int>(str.size()));
auto payload = QString::fromUtf8(str.data(), static_cast<int>(str.size()));
// convert color ranges from byte index to character index.
int color_range_start, color_range_end;
color_range_start = static_cast<int>(msg.color_range_start);
color_range_end = static_cast<int>(msg.color_range_end);
if (msg.color_range_start < msg.color_range_end) {
color_range_start = QString::fromUtf8(str.data(), msg.color_range_start).size();
color_range_end = QString::fromUtf8(str.data(), msg.color_range_end).size();
neothenil marked this conversation as resolved.
Show resolved Hide resolved
}

invoke_params params{max_lines_, // max lines
qt_text_edit_, // text edit to append to
std::move(payload), // text to append
default_color_, // default color
colors_.at(msg.level), // color to apply
static_cast<int>(msg.color_range_start), // color range start
static_cast<int>(msg.color_range_end)}; // color range end
color_range_start, // color range start
color_range_end}; // color range end

QMetaObject::invokeMethod(
qt_text_edit_, [params]() { invoke_method_(params); }, Qt::AutoConnection);
Expand Down