YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testing mixing styles

Browse Source
This commit is contained in:
Dominic Masters
2023-06-17 08:29:29 -07:00
parent f766f675ce
commit 77f5383cb9
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dawn/games/vn/components/VNTextboxScroller.cpp
View File

@ -25,9 +25,10 @@ void VNTextboxScroller::onStart() {
this->label->quadCount = 0;
this->readyToClose = false;
};
x();
useEvent(x, this->label->eventTextChanged);
useEffect(x, visibleLines)();
useEffect(x, visibleLines);
useEvent([&](float_t delta){
auto game = this->getGame();

6
src/dawn/scene/components/ui/UIBorder.cpp
View File

@ -16,13 +16,11 @@ UIBorder::UIBorder(SceneItem *item) :
}
float_t UIBorder::getContentWidth() {
if(this->texture != nullptr) return this->texture->getWidth();
return this->width;
return this->width - this->borderSize._realValue.x * 2.0f;
}
float_t UIBorder::getContentHeight() {
if(this->texture != nullptr) return this->texture->getHeight();
return this->height;
return this->height - this->borderSize._realValue.y * 2.0f;
}
float_t UIBorder::getChildOffsetX() {