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

fix EditBox error #1755

Merged
merged 1 commit into from
Mar 17, 2024
Merged

fix EditBox error #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 26 additions & 8 deletions core/ui/UIEditBox/UIEditBoxImpl-common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,22 @@ void EditBoxImplCommon::setFont(const char* pFontName, int fontSize)
_fontName = pFontName;
_fontSize = fontSize;
this->setNativeFont(pFontName, fontSize * _label->getNodeToWorldAffineTransform().a);
if (!_fontName.empty())
// edit by bixniaojiao
if (FileUtils::getInstance()->isFileExist(pFontName))
{
_label->setSystemFontName(pFontName);
TTFConfig ttfConfig(pFontName, fontSize);
_label->setTTFConfig(ttfConfig);
}
if (fontSize > 0)
else
{
_label->setSystemFontSize(fontSize);
if (!_fontName.empty())
{
_label->setSystemFontName(pFontName);
}
if (fontSize > 0)
{
_label->setSystemFontSize(fontSize);
}
}
}

Expand All @@ -183,13 +192,22 @@ void EditBoxImplCommon::setPlaceholderFont(const char* pFontName, int fontSize)
_placeholderFontName = pFontName;
_placeholderFontSize = fontSize;
this->setNativePlaceholderFont(pFontName, fontSize * _labelPlaceHolder->getNodeToWorldAffineTransform().a);
if (!_placeholderFontName.empty())
// edit by bixniaojiao
if (FileUtils::getInstance()->isFileExist(pFontName))
{
_labelPlaceHolder->setSystemFontName(pFontName);
TTFConfig ttfConfig(pFontName, fontSize);
_labelPlaceHolder->setTTFConfig(ttfConfig);
}
if (fontSize > 0)
else
{
_labelPlaceHolder->setSystemFontSize(fontSize);
if (!_fontName.empty())
{
_labelPlaceHolder->setSystemFontName(pFontName);
}
if (fontSize > 0)
{
_labelPlaceHolder->setSystemFontSize(fontSize);
}
}
}

Expand Down
11 changes: 10 additions & 1 deletion core/ui/UIEditBox/UIEditBoxImpl-wasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,16 @@ void EditBoxImplWasm::createNativeControl(const Rect& frame)
this->createEditCtrl(ax::ui::EditBox::InputMode::ANY);
}

void EditBoxImplWasm::setNativeFont(const char* pFontName, int fontSize) {}
void EditBoxImplWasm::setNativeFont(const char* pFontName, int fontSize)
{
// 设置编辑框文本大小
EM_ASM(
{
var input = Module.axmolSharedInput = Module.axmolSharedInput || document.createElement("input");
input.style.fontSize = $0 + "px";
},
fontSize);
}

void EditBoxImplWasm::setNativeFontColor(const Color4B& color)
{
Expand Down
Loading