Просмотр исходного кода

Fixed console debug event type confusion

Ivan Safrin 13 лет назад
Родитель
Сommit
08f44d6480

+ 1 - 3
IDE/Contents/Source/PolycodeConsole.cpp

@@ -52,9 +52,7 @@ void PolycodeConsole::setDebugger(PolycodeRemoteDebugger *debugger) {
 
 void PolycodeConsole::handleEvent(Event *event) {
 	if(event->getDispatcher() == consoleTextInput) {
-		if(event->getEventCode() == Event::COMPLETE_EVENT) {
-			_print(">"+consoleTextInput->getText());
-			_print("\n");
+		if(event->getEventCode() == Event::COMPLETE_EVENT && event->getEventType() == "Event") {
 			if(debugger) {
 				if(!debugger->isConnected()) {
 					_print("Unable to inject code. No debugger clients connected.\n");

+ 1 - 1
Modules/Contents/UI/Source/PolyUIHScrollBar.cpp

@@ -70,7 +70,7 @@ UIHScrollBar::UIHScrollBar(Number width, Number height, Number initialRatio) : S
 	addChild(handleBox);
 	
 	bgBox->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
-	bgBox->blockMouseInput = true;
+	bgBox->processInputEvents = true;
 	
 	handleBox->addEventListener(this, InputEvent::EVENT_MOUSEUP);
 	handleBox->addEventListener(this, InputEvent::EVENT_MOUSEUP_OUTSIDE);