From a570cd281237e268e4de52eacd5bc97a5db41624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 9 Apr 2017 18:54:52 -0300 Subject: [PATCH] UILoader outline thickness fix. --HG-- branch : dev --- src/eepp/ui/uiloader.cpp | 4 ++-- src/test/eetest.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/eepp/ui/uiloader.cpp b/src/eepp/ui/uiloader.cpp index bd354a42f..c60598420 100644 --- a/src/eepp/ui/uiloader.cpp +++ b/src/eepp/ui/uiloader.cpp @@ -72,7 +72,7 @@ void UILoader::update() { UILoader * UILoader::setOutlineThickness( const Float& thickness ) { mOutlineThickness = thickness; - mCircle.setRadius( PixelDensity::dpToPx( mRadius ) - mOutlineThickness ); + mCircle.setRadius( PixelDensity::dpToPx( mRadius ) - PixelDensity::dpToPx( mOutlineThickness ) ); return this; } @@ -83,7 +83,7 @@ const Float& UILoader::getOutlineThickness() const { UILoader * UILoader::setRadius( const Float& radius ) { mRadius = radius; Float rRadius = PixelDensity::dpToPx( radius ); - mCircle.setRadius( rRadius - mOutlineThickness ); + mCircle.setRadius( rRadius - PixelDensity::dpToPx( mOutlineThickness ) ); mArc.setRadius( rRadius ); return this; } diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index 2d3e23927..11507e5f5 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -511,9 +511,8 @@ void EETest::createNewUI() { std::vector str = getTestStringArr(); UILoader * loader = UILoader::New(); - loader->setOutlineThickness(8) + loader->setOutlineThickness( 4 ) ->setRadius( 25 ) - ->setOutlineThickness( 8 ) ->setPosition( 800, 0 ) ->setSize( 100, 100 ) ->setBackgroundFillEnabled( true )->setColor( 0xCCCCCCCC );