Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-23 03:02:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

UINode border fixes.

Browse Source 
--HG--
branch : dev-css
This commit is contained in:
Martín Lucas Golini
2019-02-06 01:41:40 -03:00
parent afd979bb20
commit 3a1fbaec49
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/eepp/graphics/rectangledrawable.cpp
View File

@@ -94,9 +94,11 @@ Uint32 RectangleDrawable::getCorners() const {
}
void RectangleDrawable::setCorners(const Uint32 & corners) {
mCorners = corners;
mNeedsUpdate = true;
mRecreateVertexBuffer = true;
if ( corners != mCorners ) {
mCorners = corners;
mNeedsUpdate = true;
mRecreateVertexBuffer = true;
}
}
RectColors RectangleDrawable::getRectColors() const {

36
src/eepp/ui/uinode.cpp
View File

@@ -417,37 +417,28 @@ Color UINode::getBackgroundColor() const {
}
UINode * UINode::setBorderRadius( const unsigned int& corners ) {
setBorderEnabled( true )->setCorners( corners );
UISkin * background = setBackgroundFillEnabled( true );
Drawable * stateDrawable = background->getStateDrawable( UIState::StateFlagNormal );
if ( NULL == stateDrawable ) {
setBackgroundColor( Color::Black );
setBackgroundColor( Color::Transparent );
stateDrawable = background->getStateDrawable( UIState::StateFlagNormal );
}
if ( stateDrawable->getDrawableType() == Drawable::RECTANGLE ) {
RectangleDrawable * rectangleDrawable = static_cast<RectangleDrawable*>( stateDrawable );
rectangleDrawable->setCorners( corners );
static_cast<RectangleDrawable*>( stateDrawable )->setCorners( corners );
}
return this;
}
Uint32 UINode::getBorderRadius() const {
if ( NULL != mBackgroundState && NULL != mBackgroundState->getSkin() ) {
Drawable * stateDrawable = mBackgroundState->getSkin()->getStateDrawable( UIState::StateFlagNormal );
if ( NULL != stateDrawable ) {
if ( stateDrawable->getDrawableType() == Drawable::RECTANGLE ) {
RectangleDrawable * rectangleDrawable = static_cast<RectangleDrawable*>( stateDrawable );
return rectangleDrawable->getCorners();
}
}
}
if ( NULL != mBorder )
return mBorder->getCorners();
return 0;
}
@@ -574,7 +565,7 @@ UINode * UINode::unsetFlags(const Uint32 & flags) {
return this;
}
UINode *UINode::resetFlags( Uint32 newFlags ) {
UINode * UINode::resetFlags( Uint32 newFlags ) {
mFlags = newFlags;
return this;
}
@@ -593,18 +584,8 @@ void UINode::drawForeground() {
void UINode::drawBorder() {
if ( ( mFlags & UI_BORDER ) && NULL != mBorder ) {
if ( NULL != mBorder && NULL != mBackgroundState && NULL != mBackgroundState->getSkin() ) {
Drawable * backDrawable = mBackgroundState->getSkin()->getStateDrawable( mBackgroundState->getCurrentState() );
if ( NULL != backDrawable && backDrawable->getDrawableType() == Drawable::RECTANGLE ) {
RectangleDrawable * backgroundDrawable = static_cast<RectangleDrawable*>( backDrawable );
getBorder()->setCorners( backgroundDrawable->getCorners() );
}
}
Uint8 alpha = mBorder->getAlpha();
mBorder->setAlpha( eemax<Uint32>( mAlpha * alpha / 255.f, 255 ) );
mBorder->setAlpha( eemin<Uint32>( mAlpha * alpha / 255.f, 255 ) );
mBorder->draw( Vector2f( mScreenPosi.x, mScreenPosi.y ), Sizef( eefloor(mSize.getWidth()), eefloor(mSize.getHeight()) ) );
mBorder->setAlpha( alpha );
}
@@ -658,6 +639,7 @@ UISkin * UINode::getForeground() {
RectangleDrawable * UINode::getBorder() {
if ( NULL == mBorder ) {
mBorder = RectangleDrawable::New();
mBorder->setColor( Color::Transparent );
mBorder->setFillMode( PrimitiveFillMode::DRAW_LINE );
mBorder->setLineWidth( PixelDensity::dpToPx(1) );
}