From 35a9006b4c367c8f5b05b910fd70fbc087516628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Thu, 12 Dec 2019 03:10:20 -0300
Subject: [PATCH] Fixed Node::removeEventListener. Fixed UIWidget CSS
 setBorderWidth. Fixed a bug in the UIEditor.

--HG--
branch : dev
---
 src/eepp/scene/node.cpp         | 4 ++--
 src/eepp/ui/uiwidget.cpp        | 2 +-
 src/tools/uieditor/uieditor.cpp | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/eepp/scene/node.cpp b/src/eepp/scene/node.cpp
index 1b8e33552..ac1d2169c 100644
--- a/src/eepp/scene/node.cpp
+++ b/src/eepp/scene/node.cpp
@@ -988,9 +988,9 @@ void Node::removeEventListener( const Uint32& CallbackId ) {
 	EventsMap::iterator it;
 
 	for ( it = mEvents.begin(); it != mEvents.end(); ++it ) {
-		std::map<Uint32, EventCallback> event = it->second;
+		std::map<Uint32, EventCallback>& event = it->second;
 
-		if ( event.erase( CallbackId ) )
+		if ( event.erase( CallbackId ) > 0 )
 			break;
 	}
 }
diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp
index 075ee693b..6ab38f179 100644
--- a/src/eepp/ui/uiwidget.cpp
+++ b/src/eepp/ui/uiwidget.cpp
@@ -1078,7 +1078,7 @@ bool UIWidget::applyProperty( const StyleSheetProperty& attribute ) {
 			setBorderColor( attribute.asColor() );
 			break;
 		case PropertyId::BorderWidth:
-			setBorderWidth( attribute.asDpDimensionI("1") );
+			setBorderWidth( PixelDensity::dpToPxI( attribute.asDpDimensionI("1") ) );
 			break;
 		case PropertyId::BorderRadius:
 			setBorderRadius( PixelDensity::dpToPxI( attribute.asDpDimensionUint() ));
diff --git a/src/tools/uieditor/uieditor.cpp b/src/tools/uieditor/uieditor.cpp
index 614e1e9d3..60352d966 100644
--- a/src/tools/uieditor/uieditor.cpp
+++ b/src/tools/uieditor/uieditor.cpp
@@ -256,6 +256,7 @@ static void loadLayout( std::string file ) {
 	}
 
 	uiContainer->getContainer()->childsCloseAll();
+	uiSceneNode->update(Time::Zero);
 
 	uiSceneNode->loadLayoutFromFile( file, uiContainer );
 
@@ -678,6 +679,7 @@ void closeProject() {
 	currentLayout = "";
 	currentStyleSheet = "";
 	uiContainer->getContainer()->childsCloseAll();
+	uiSceneNode->update(Time::Zero);
 	uiSceneNode->setStyleSheet( CSS::StyleSheet() );
 
 	layouts.clear();