copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove carriage return characters from textboxes

Browse source
This commit is contained in:
Yousef Khadadeh 2025-12-03 09:29:51 +03:00
parent 06d9fb68f3
commit 244a4fa718
5 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/Helpers/StringHelpers.cpp
View file

@ -77,3 +77,8 @@ bool is_valid_http_url(const std::string& str) {
return std::regex_match(str, pattern);
}
std::string remove_carriage_returns_from_str(std::string s) {
std::erase(s, '\r');
return s;
}

2
include/Helpers/StringHelpers.hpp
View file

@ -10,5 +10,5 @@ std::vector<std::string> split_string_by_token(std::string str, std::string toke
uint8_t ascii_hex_char_to_number_no_checks(char asciiHex);
std::string byte_vector_to_hex_str(const std::vector<uint8_t>& byteVec);
std::string read_file_to_string(const std::filesystem::path& filePath);
void remove_whitespaces_from_str(std::string& str);
bool is_valid_http_url(const std::string& str);
std::string remove_carriage_returns_from_str(std::string s);

2
src/InputManager.cpp
View file

@ -389,7 +389,7 @@ void InputManager::process_text_paste(const std::string& plainClipboardStr) {
if(text.textBox) {
// Workaround for not being able to copy richtext to system clipboard, this should at least work within the application itself
if(text.isRichTextBox && text.isNextPasteRich && lastCopiedRichText.has_value()) {
if(lastCopiedRichText.value().get_plain_text() == plainClipboardStr)
if(lastCopiedRichText.value().get_plain_text() == remove_carriage_returns_from_str(plainClipboardStr))
text.textBox->process_rich_text_input(*text.cursor, lastCopiedRichText.value());
else
text.textBox->process_text_input(*text.cursor, plainClipboardStr, text.modMap);

3
src/RichText/TextBox.cpp
View file

@ -994,7 +994,8 @@ TextPosition TextBox::insert(TextPosition pos, std::string_view textToInsert, co
TextPosition oldPos = pos = move(Movement::NOWHERE, pos);
for(char c : textToInsert) {
if(c == '\n') {
if(c == '\r') {}
else if(c == '\n') {
if(newlinesAllowed) {
for(auto& [p, tStylesInPos] : tStyleMods) {
if(p.fParagraphIndex > pos.fParagraphIndex)

6
src/RichText/TextBox.hpp
View file

@ -45,9 +45,13 @@ class TextData {
struct Paragraph {
std::string text;
ParagraphStyleData pStyleData;
template<typename Archive> void serialize(Archive& a) {
template<typename Archive> void save(Archive& a) const {
a(text, pStyleData);
}
template<typename Archive> void load(Archive& a) {
a(text, pStyleData);
std::erase(text, '\r'); // Remove \r characters from older versions
}
};
std::string get_serialized() const;
static TextData deserialize_string(std::string& s);