Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-14 13:15:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Node::removeEventListener.

Browse Source 
Fixed UIWidget CSS setBorderWidth.
Fixed a bug in the UIEditor.

--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2019-12-12 03:10:20 -03:00
parent bdbae585c9
commit 35a9006b4c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eepp/scene/node.cpp
View File

@@ -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;
}
}

2
src/eepp/ui/uiwidget.cpp
View File

@@ -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() ));

2
src/tools/uieditor/uieditor.cpp
View File

@@ -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();