Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Text wrapping bugfixes

Browse source
This commit is contained in:
Henrik Rydgård 2024-05-25 09:14:03 +02:00
parent e552ba0b1e
commit 5d8560e379
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/Data/Encoding/Utf8.cpp
View file

@ -29,6 +29,7 @@
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Data/Encoding/Utf16.h"
#include "Common/Log.h"
// is start of UTF sequence
inline bool isutf(char c) {
@ -209,6 +210,7 @@ int u8_charnum(const char *s, int offset)
/* reads the next utf-8 sequence out of a string, updating an index */
uint32_t u8_nextchar(const char *s, int *index, size_t size) {
uint32_t ch = 0;
_dbg_assert_(*index >= 0 && *index < 100000000);
int sz = 0;
int i = *index;
do {
@ -372,8 +374,6 @@ int u8_is_locale_utf8(const char *locale)
return 0;
}
UTF8::UTF8(const char *c) : c_(c), size_((int)strlen(c)), index_(0) {}
bool AnyEmojiInString(std::string_view str, size_t byteCount) {
int i = 0;
while (i < byteCount) {

2
Common/Data/Encoding/Utf8.h
View file

@ -39,7 +39,7 @@ class UTF8 {
public:
static const uint32_t INVALID = (uint32_t)-1;
// TODO: Try to get rid of this constructor.
explicit UTF8(const char *c);
explicit UTF8(const char *c) : c_(c), size_((int)strlen(c)), index_(0) {}
explicit UTF8(std::string_view view) : c_(view.data()), size_((int)view.size()), index_(0) {}
explicit UTF8(std::string_view view, int index) : c_(view.data()), size_((int)view.size()), index_(index) {}
bool end() const { return index_ == size_; }

5
Common/Data/Text/WrapText.cpp
View file

@ -219,7 +219,10 @@ void WordWrapper::Wrap() {
}
// Measure the entire word for kerning purposes. May not be 100% perfect.
float newWordWidth = MeasureWidth(str_.substr(lastIndex_, afterIndex - lastIndex_));
float newWordWidth = 0.0f;
if (afterIndex <= str_.length()) {
newWordWidth = MeasureWidth(str_.substr(lastIndex_, afterIndex - lastIndex_));
}
// Is this the end of a word (space)? We'll also output up to a soft hyphen.
if (wordWidth_ > 0.0f && IsSpaceOrShy(c)) {

7
Common/Render/DrawBuffer.cpp
View file

@ -463,12 +463,15 @@ float AtlasWordWrapper::MeasureWidth(std::string_view str) {
uint32_t c = utf.next();
if (c == '&') {
// Skip ampersand prefixes ("&&" is an ampersand.)
if (utf.end()) {
break;
}
c = utf.next();
}
const AtlasChar *ch = atlasfont_.getChar(c);
if (!ch)
if (!ch) {
ch = atlasfont_.getChar('?');
}
w += ch->wx * scale_;
}
return w;