Merge pull request #2018 from yann300/bugFix

Mix - Bug fixes

mix/ClientModel.cpp

@@ -484,7 +484,10 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
 				if (!functionName.isEmpty() && ((prevInstruction.getJumpType() == AssemblyItem::JumpType::IntoFunction) || solCallStack.empty()))
 					solCallStack.push_front(QVariant::fromValue(functionName));
 				else if (prevInstruction.getJumpType() == AssemblyItem::JumpType::OutOfFunction && !solCallStack.empty())
+				{
 					solCallStack.pop_front();
+					solLocals.clear();
+				}
 			}
 
 			//format solidity context values

mix/qml/DebuggerPaneStyle.qml

@@ -9,6 +9,8 @@ QtObject {
 
 	property QtObject general: QtObject {
 		property int basicFontSize: absoluteSize(-2)
+		property string basicColor: "#4a4a4a"
+		property string basicFont: "monospace"
 		property int dataDumpFontSize: absoluteSize(-3)
 	}
 }

mix/qml/QIntTypeView.qml

@@ -5,24 +5,24 @@ Item
 	property alias value: textinput.text
 	property alias readOnly: textinput.readOnly
 	id: editRoot
-	height: 20
 	width: readOnly ? textinput.implicitWidth : 150
 
-	SourceSansProBold
-	{
-		id: boldFont
+	DebuggerPaneStyle {
+		id: dbgStyle
 	}
 
 	Rectangle {
 		anchors.fill: parent
 		radius: 4
 		TextInput {
+			anchors.verticalCenter: parent.verticalCenter
 			id: textinput
-			text: value
-			anchors.fill: parent
-			font.family: boldFont.name
+			font.family: dbgStyle.general.basicFont
 			clip: true
 			selectByMouse: true
+			text: value
+			font.pointSize: dbgStyle.general.basicFontSize
+			color: dbgStyle.general.basicColor
 		}
 	}
 }

mix/qml/StructView.qml

@@ -13,6 +13,11 @@ Column
 	property string context
 	Layout.fillWidth: true
 	spacing: 0
+
+	DebuggerPaneStyle {
+		id: dbgStyle
+	}
+
 	Repeater
 	{
 		id: repeater
@@ -29,6 +34,9 @@ Column
 				id: typeLabel
 				text: modelData.type.name
 				anchors.verticalCenter: parent.verticalCenter
+				font.family: dbgStyle.general.basicFont
+				color: dbgStyle.general.basicColor
+				font.pointSize: dbgStyle.general.basicFontSize
 			}
 
 			DefaultLabel {
@@ -36,6 +44,9 @@ Column
 				id: nameLabel
 				text: modelData.name
 				anchors.verticalCenter: parent.verticalCenter
+				font.family: dbgStyle.general.basicFont
+				color: dbgStyle.general.basicColor
+				font.pointSize: dbgStyle.general.basicFontSize
 			}
 
 			DefaultLabel {
@@ -43,7 +54,11 @@ Column
 				id: equalLabel
 				text: "="
 				anchors.verticalCenter: parent.verticalCenter
+				font.family: dbgStyle.general.basicFont
+				color: dbgStyle.general.basicColor
+				font.pointSize: dbgStyle.general.basicFontSize
 			}
+
 			Loader
 			{
 				id: typeLoader

mix/qml/VariablesView.qml

@@ -18,7 +18,7 @@ DebugInfoList
 			property alias members: typeLoader.members;
 			property alias value: typeLoader.value;
 			anchors.fill: parent
-			anchors.rightMargin: 8
+			anchors.leftMargin: 10
 			StructView
 			{
 				id: typeLoader