mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-01 17:39:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_textbox OK

Browse Source
This commit is contained in:
robojumper
2025-05-22 16:25:37 +02:00
parent 7148cc13d9
commit f3b8dc17d8
3 changed files with 38 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/d_textbox.cpp
+14 -41
View File
@@ -683,10 +683,7 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
while (remain > 0 && i < 10) {
bool bOver;
f32 lineWidth;
int lineStrNum = GetStoredLineStrNum(i, &lineWidth, &bOver);
// lineWidth = mLineWidths[i];
// int lineStrNum = mLineStrNums[i];
// bOver = mbOvers[i];
s32 lineStrNum = GetStoredLineStrNum(i, &lineWidth, &bOver);
f32 textPosX = textRect.left + hMag * (texWidth - lineWidth);
writer.SetCursorX(textPosX);
writer.PrintMutable(strPos, lineStrNum);
@@ -703,15 +700,12 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
while (remain > 0 && i < 10) {
bool bOver;
f32 lineWidth;
int lineStrNum = CalcLineStrNum(&lineWidth, &writer, strPos, remain, mSize.width, &bOver);
s32 lineStrNum = CalcLineStrNum(&lineWidth, &writer, strPos, remain, mSize.width, &bOver);
f32 textPosX = textRect.left + hMag * (texWidth - lineWidth);
writer.SetCursorX(textPosX);
writer.PrintMutable(strPos, lineStrNum);
if (mHasTextWriter && field_0x201 == true && i < 10) {
SetStoredLineStrNum(i, lineWidth, lineStrNum, bOver);
// mLineWidths[i] = lineWidth;
// mLineStrNums[i] = lineStrNum;
// mbOvers[i] = bOver;
}
if (bOver) {
writer.PrintMutable(L"\n", 1);
@@ -722,30 +716,21 @@ void dTextBox_c::DrawSelf(const nw4r::lyt::DrawInfo &drawInfo) {
}
}
/*
const wchar_t *strPos = mTextBuf;
writer.SetCursor(textRect.left, -textRect.top);
f32 texWidth = textRect.GetWidth();
int remain = mTextLen;
while (remain > 0) {
bool bOver;
f32 lineWidth;
int lineStrNum = CalcLineStrNum(&lineWidth, &writer, strPos, remain, mSize.width, &bOver);
f32 textPosX = textRect.left + hMag * (texWidth - lineWidth);
writer.SetCursorX(textPosX);
writer.PrintMutable(strPos, lineStrNum);
if (bOver) {
writer.PrintMutable(L"\n", 1);
}
strPos += lineStrNum;
remain -= lineStrNum;
}
*/
mHasTextWriter = false;
}
static int CalcLineStrNum(
f32 *pWidth, nw4r::ut::TextWriterBase<wchar_t> *pTextWriter, const wchar_t *str, int length, f32 maxWidth,
bool *pbOver
) {
nw4r::ut::Rect rect;
nw4r::ut::TextWriterBase<wchar_t> writerCpy(*pTextWriter);
writerCpy.SetCursor(0.0f, 0.0f);
int ret = CalcLineRectImpl(&rect, &writerCpy, str, length, maxWidth, pbOver, nullptr);
*pWidth = rect.right - rect.left;
return ret;
}
void dTextBox_c::loadTextFormatVars() {
u16 myNum = GetExtUserDataNum();
if (myNum == 0) {
@@ -841,18 +826,6 @@ void dTextBox_c::setupGX() const {
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
}
static int CalcLineStrNum(
f32 *pWidth, nw4r::ut::TextWriterBase<wchar_t> *pTextWriter, const wchar_t *str, int length, f32 maxWidth,
bool *pbOver
) {
nw4r::ut::Rect rect;
nw4r::ut::TextWriterBase<wchar_t> writerCpy(*pTextWriter);
writerCpy.SetCursor(0.0f, 0.0f);
int ret = CalcLineRectImpl(&rect, &writerCpy, str, length, maxWidth, pbOver, nullptr);
*pWidth = rect.right - rect.left;
return ret;
}
void dTextBox_c::MySetFontSize(const nw4r::lyt::Size &value) {
mMyFontSize = value;
}