Merge pull request #588 from fodinabor/IDEFixes

ivansafrin · ivansafrin · commit 0f29a7fefab0 · 2014-12-28T12:23:53.000-05:00
Ide fixes
diff --git a/Assets/UIThemes.pak b/Assets/UIThemes.pak
diff --git a/Assets/UIThemes/dark/theme.xml b/Assets/UIThemes/dark/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/Assets/UIThemes/dark_retina/theme.xml b/Assets/UIThemes/dark_retina/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/Assets/UIThemes/default/theme.xml b/Assets/UIThemes/default/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/Assets/UIThemes/default_retina/theme.xml b/Assets/UIThemes/default_retina/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/Core/Contents/Include/PolyInputKeys.h b/Core/Contents/Include/PolyInputKeys.h
@@ -232,9 +232,9 @@ namespace Polycode {
 		KEY_LEFT		= 276,
 		KEY_INSERT		= 277,
 		KEY_HOME		= 278,
-		KEY_END		= 279,
+		KEY_END			= 279,
 		KEY_PAGEUP		= 280,
-		KEY_PAGEDOWN		= 281,
+		KEY_PAGEDOWN	= 281,
 		
 		/* Function keys */
 		KEY_F1			= 282,
diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
@@ -14,6 +14,7 @@ OUTPUT doc_cmd
 COMMAND ${DOXYGEN_EXECUTABLE} ${Polycode_SOURCE_DIR}/Documentation/Doxygen/Polycode.doxygen
 COMMAND ${DOXYGEN_EXECUTABLE} ${Polycode_SOURCE_DIR}/Documentation/Doxygen/Physics2D.doxygen
 COMMAND ${DOXYGEN_EXECUTABLE} ${Polycode_SOURCE_DIR}/Documentation/Doxygen/Physics3D.doxygen
+COMMAND ${DOXYGEN_EXECUTABLE} ${Polycode_SOURCE_DIR}/Documentation/Doxygen/Polycode_ui.doxygen
 COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/doc_cmd # Generate the given output file(empty file), to keep track of whether we need to rebuild.
 WORKING_DIRECTORY ${Polycode_SOURCE_DIR}/Documentation/Doxygen/
 DEPENDS ${HEADER_DEPENDENCIES_CORE} ${HEADER_DEPENDENCIES_2DPHYSICS} ${HEADER_DEPENDENCIES_3DPHYSICS} ${HEADER_DEPENDENCIES_UI}
@@ -28,7 +29,9 @@ INSTALL(DIRECTORY Doxygen/output/standalone/Physics2D
         DESTINATION Docs/Modules)
 INSTALL(DIRECTORY Doxygen/output/standalone/Physics3D
         DESTINATION Docs/Modules)
-
+INSTALL(DIRECTORY Doxygen/output/standalone/PolycodeUI
+		DESTINATION Docs/Modules)
+		
 ENDIF(DOXYGEN_FOUND)
 
 ENDIF(POLYCODE_BUILD_DOCS)
diff --git a/Documentation/Doxygen/Polycode.doxygen b/Documentation/Doxygen/Polycode.doxygen
diff --git a/Documentation/Doxygen/index.dox b/Documentation/Doxygen/index.dox
@@ -4,9 +4,9 @@
 \mainpage Polycode
 
 \section Modules
-<a href="../../Polycode/html/index.html">Core</a> <br>
-<a href="../../PolycodeUI/html/index.html">UI Module</a> <br> 
-<a href="../../Physics2D/html/index.html">Physics2D</a> <br>
-<a href="../../Physics3D/html/index.html">Physics3D</a> <br>
+<a href="../../../Core/Polycode/html/index.html">Core</a> <br>
+<a href="../../../Modules/PolycodeUI/html/index.html">UI Module</a> <br> 
+<a href="../../../Modules/Physics2D/html/index.html">Physics2D</a> <br>
+<a href="../../../Modules/Physics3D/html/index.html">Physics3D</a> <br>
 
 */
diff --git a/IDE/Contents/Resources/UIThemes/dark/theme.xml b/IDE/Contents/Resources/UIThemes/dark/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/IDE/Contents/Resources/UIThemes/dark_retina/theme.xml b/IDE/Contents/Resources/UIThemes/dark_retina/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x3a3a3aff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x545454FF</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/IDE/Contents/Resources/UIThemes/default/theme.xml b/IDE/Contents/Resources/UIThemes/default/theme.xml
@@ -12,7 +12,8 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
-
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
+	
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
 	<uiDefaultFontSize>12</uiDefaultFontSize>
diff --git a/IDE/Contents/Resources/UIThemes/default_retina/theme.xml b/IDE/Contents/Resources/UIThemes/default_retina/theme.xml
@@ -12,6 +12,7 @@
 	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
 	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
 	<uiSectionFontColor>0x00000080</uiSectionFontColor>
+	<uiMenuBarBgColor>0x00000000</uiMenuBarBgColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
diff --git a/IDE/Contents/Source/ExampleBrowserWindow.cpp b/IDE/Contents/Source/ExampleBrowserWindow.cpp
@@ -45,6 +45,7 @@ ExampleBrowserWindow::ExampleBrowserWindow() : UIWindow(L"Example Browser", 320,
 	templateContainer->getRootNode()->toggleCollapsed();
 	
 	templateContainer->getRootNode()->addEventListener(this, UITreeEvent::SELECTED_EVENT);
+	templateContainer->getRootNode()->addEventListener(this, UITreeEvent::EXECUTED_EVENT);
 	
 	vector<OSFileEntry> templates = OSBasics::parseFolder(RESOURCE_PATH"Standalone/Examples/Lua", false);
 	for(int i=0; i < templates.size(); i++) {
@@ -104,12 +105,21 @@ void ExampleBrowserWindow::handleEvent(Event *event) {
 		}
 	}
 	
-	if(event->getEventType() == "UITreeEvent" && event->getEventCode() == UITreeEvent::SELECTED_EVENT) {
-		if(event->getDispatcher() == templateContainer->getRootNode()) {
-			UITreeEvent *treeEvent = (UITreeEvent*) event;
-			ExampleTemplateUserData *data = (ExampleTemplateUserData *)treeEvent->selection->getUserData();
-			if(data->type == 1)
-				templateFolder = data->templateFolder;
+	if(event->getEventType() == "UITreeEvent") {
+		if (event->getDispatcher() == templateContainer->getRootNode()) {
+			UITreeEvent *treeEvent = (UITreeEvent*)event;
+			if (event->getEventCode() == UITreeEvent::SELECTED_EVENT){
+				ExampleTemplateUserData *data = (ExampleTemplateUserData *)treeEvent->selection->getUserData();
+				if (data->type == 1)
+					templateFolder = data->templateFolder;
+			}
+			if (event->getEventCode() == UITreeEvent::EXECUTED_EVENT){
+				UITree *node = treeEvent->selection;
+				if (node) {
+					ExampleTemplateUserData *data = (ExampleTemplateUserData*)node->getUserData();
+					dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);
+				}
+			}
 		}
 	}
 	
diff --git a/IDE/Contents/Source/NewFileWindow.cpp b/IDE/Contents/Source/NewFileWindow.cpp
@@ -41,6 +41,7 @@ NewFileWindow::NewFileWindow() : UIWindow(L"Create New File", 580, 280) {
 	templateContainer->getRootNode()->toggleCollapsed();
 	
 	templateContainer->getRootNode()->addEventListener(this, UITreeEvent::SELECTED_EVENT);
+	templateContainer->getRootNode()->addEventListener(this, UITreeEvent::EXECUTED_EVENT);
 	
 	
 	vector<OSFileEntry> templates = OSBasics::parseFolder(RESOURCE_PATH"FileTemplates", false);
@@ -105,22 +106,31 @@ void NewFileWindow::handleEvent(Event *event) {
 	if(event->getEventType() == "UIEvent") {
 		if(event->getEventCode() == UIEvent::CLICK_EVENT) {
 			if(event->getDispatcher() == okButton) {
-				dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);						
+				dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);
 			}
 			
 			if(event->getDispatcher() == cancelButton) {
-				dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);				
+				dispatchEvent(new UIEvent(), UIEvent::CLOSE_EVENT);
 			}									
 		}
 	}
 	}
 	
-	if(event->getEventType() == "UITreeEvent" && event->getEventCode() == UITreeEvent::SELECTED_EVENT) {
-		if(event->getDispatcher() == templateContainer->getRootNode()) {
-			UITreeEvent *treeEvent = (UITreeEvent*) event;
+	if(event->getEventType() == "UITreeEvent") {
+		if (event->getEventCode() == UITreeEvent::SELECTED_EVENT){
+			if (event->getDispatcher() == templateContainer->getRootNode()) {
+				UITreeEvent *treeEvent = (UITreeEvent*)event;
+				FileTemplateUserData *data = (FileTemplateUserData *)treeEvent->selection->getUserData();
+				if (data->type == 1)
+					templatePath = data->templatePath;
+			}
+		}
+		if (event->getEventCode() == UITreeEvent::EXECUTED_EVENT){
+			UITreeEvent *treeEvent = (UITreeEvent*)event;
 			FileTemplateUserData *data = (FileTemplateUserData *)treeEvent->selection->getUserData();
-			if(data->type == 1)
+			if (data->type == 1)
 				templatePath = data->templatePath;
+			dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);
 		}
 	}
 	
diff --git a/IDE/Contents/Source/PolycodeIDEApp.cpp b/IDE/Contents/Source/PolycodeIDEApp.cpp
@@ -866,7 +866,9 @@ void PolycodeIDEApp::handleEvent(Event *event) {
 						renameFile();
 					} else if(bEvent->command == "remove") {
 						removeFile();
-					}																				
+					} else if (bEvent->command == "close_project"){
+						closeProject();
+					}
 				break;
 			}
 		}
diff --git a/IDE/Contents/Source/PolycodeProjectBrowser.cpp b/IDE/Contents/Source/PolycodeProjectBrowser.cpp
@@ -69,7 +69,7 @@ void PolycodeProjectBrowser::handleEvent(Event *event) {
 	if(event->getDispatcher() == contextMenu) {
 		UIMenuItem *item = contextMenu->getSelectedItem();
 
-		PolycodeProjectBrowserEvent *bEvent = new PolycodeProjectBrowserEvent();			
+		PolycodeProjectBrowserEvent *bEvent = new PolycodeProjectBrowserEvent();
 		bEvent->command = item->_id;
 		dispatchEvent(bEvent, PolycodeProjectBrowserEvent::HANDLE_MENU_COMMAND);
 						
@@ -91,9 +91,13 @@ void PolycodeProjectBrowser::handleEvent(Event *event) {
 			contextMenu->addOption("Import 3D assets", "import_assets");
 			contextMenu->addDivider();
 			contextMenu->addOption("Refresh", "refresh");
-			contextMenu->addOption("Rename", "rename");						
-			contextMenu->addDivider();
-			contextMenu->addOption("Remove", "remove");
+			if (treeContainer->getRootNode() == treeContainer->getRootNode()->getSelectedNode()){
+				contextMenu->addOption("Close Project", "close_project");
+			} else {
+				contextMenu->addOption("Rename", "rename");
+				contextMenu->addDivider();
+				contextMenu->addOption("Remove", "remove");
+			}
 
 			contextMenu->fitToScreenVertical();
 			
diff --git a/IDE/Contents/Source/PolycodeTextEditor.cpp b/IDE/Contents/Source/PolycodeTextEditor.cpp
@@ -371,7 +371,7 @@ std::vector<SyntaxHighlightToken> PolycodeSyntaxHighlighter::parseLua(String tex
 				tokens.push_back(SyntaxHighlightToken(line, type));
 			tokens.push_back(SyntaxHighlightToken(ch, ch_type));
 
-			if(ch == '-' && lastSeparator == '-' && mode != MODE_STRING) {
+			if(ch == '-' && lastSeparator == '-' && text[i-1] == lastSeparator && mode != MODE_STRING) {
 				isComment = true;
 				tokens[tokens.size()-1].type = MODE_COMMENT;
 				tokens[tokens.size()-2].type = MODE_COMMENT;				
diff --git a/IDE/Contents/Source/PolycodeToolLauncher.cpp b/IDE/Contents/Source/PolycodeToolLauncher.cpp
@@ -51,15 +51,15 @@ void PolycodeRunner::runThread() {
 #if defined(__APPLE__) && defined(__MACH__)
 	String command = "../MacOS/PolycodePlayer";	
 	String inFolder = polycodeBasePath+"/Standalone/Player/PolycodePlayer.app/Contents/Resources";
-	String args = polyappPath;
+	String args = "\""+polyappPath+"\""+;
 #elif defined _WINDOWS
 	String command = "\""+polycodeBasePath+"/Standalone/Player/PolycodePlayer.exe\"";
-	String args = polyappPath;
+	String args = "\""+polyappPath+"\"";
 	String inFolder = polycodeBasePath+"/Standalone/Player";
 #else
 	String command = "./PolycodePlayer";	
 	String inFolder = polycodeBasePath+"/Standalone/Player";
-	String args = polyappPath;
+	String args = "\""+polyappPath+"\"";
 #endif
 
 	String ret = CoreServices::getInstance()->getCore()->executeExternalCommand(command, args, inFolder);
diff --git a/IDE/Contents/Source/TextureBrowser.cpp b/IDE/Contents/Source/TextureBrowser.cpp
@@ -215,6 +215,7 @@ void AssetList::showFolder(String folderPath) {
 			if(hasExtension(entry.extension)) {
 				AssetEntry *newEntry = new AssetEntry(entry.fullPath, entry.name, entry.extension, NULL);
 				newEntry->selectShape->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
+				newEntry->selectShape->addEventListener(this, InputEvent::EVENT_DOUBLECLICK);
 				assetEntries.push_back(newEntry);
 				newEntry->setPosition(xPos, yPos);
 				xPos += 120;
@@ -244,14 +245,19 @@ void AssetList::handleEvent(Event *event) {
 		showFolder(currentFolderPath);
 	} else {
 		for(int i=0; i < assetEntries.size(); i++) {
-			if(event->getDispatcher() == assetEntries[i]->selectShape && event->getEventCode() == InputEvent::EVENT_MOUSEDOWN) {
-				assetEntries[i]->selectShape->visible = true;
-				selectedPath = assetEntries[i]->assetPath;
-				if(currentEntry) {
-					currentEntry->selectShape->visible = false;
+			if (event->getDispatcher() == assetEntries[i]->selectShape) {
+				if (event->getEventCode() == InputEvent::EVENT_MOUSEDOWN){
+					if (currentEntry) {
+						currentEntry->selectShape->visible = false;
+					}
+					assetEntries[i]->selectShape->visible = true;
+					selectedPath = assetEntries[i]->assetPath;
+					currentEntry = assetEntries[i];
+					selectedResource = assetEntries[i]->resource;
+				}
+				if (event->getEventCode() == InputEvent::EVENT_DOUBLECLICK){
+					dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);
 				}
-				currentEntry = assetEntries[i];
-                selectedResource = assetEntries[i]->resource;
 			}
 		}
 	}
@@ -281,9 +287,10 @@ AssetBrowser::AssetBrowser() : UIWindow(L"Asset Browser", 850, 500) {
 	
 		
 	assetList = new AssetList();
-	
+	assetList->addEventListener(this, UIEvent::OK_EVENT);
+
 	listContainer = new UIScrollContainer(assetList, false, true, 640, 480-topPadding-padding-padding);
-	listContainer->setPosition(220,topPadding+padding);		
+	listContainer->setPosition(220,topPadding+padding);
 	addChild(listContainer);
 
 	cancelButton = new UIButton(L"Cancel", 100);
@@ -409,6 +416,9 @@ void AssetBrowser::handleEvent(Event *event) {
                 removeAllHandlers();
 			}									
 		}
+		if (event->getEventCode() == UIEvent::OK_EVENT){
+			dispatchEvent(new UIEvent(), UIEvent::OK_EVENT);
+		}
 	}
 	
 	if(event->getEventType() == "UITreeEvent" && event->getEventCode() == UITreeEvent::SELECTED_EVENT) {
diff --git a/Modules/Contents/UI/Source/PolyUIMenuBar.cpp b/Modules/Contents/UI/Source/PolyUIMenuBar.cpp
@@ -46,7 +46,7 @@ UIMenuBarEntry::UIMenuBarEntry(String name): UIElement() {
 	bg->setAnchorPoint(-1.0, -1.0, 0.0);
 	addChild(bg);
 	bg->processInputEvents = true;
-	bg->color.setColorHex(0x00000000);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
 	addChild(label);
 	label->setPosition(10, 5);
 }
@@ -56,7 +56,7 @@ void UIMenuBarEntry::Select() {
 }
 
 void UIMenuBarEntry::Deselect() {
-	bg->color.setColorHex(0x00000000);
+	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiMenuBarBgColor"));
 }
 
 void UIMenuBarEntry::addItem(String name, String code, PolyKEY shortCut1, PolyKEY shortCut2) {
@@ -69,12 +69,15 @@ UIMenuBarEntry::~UIMenuBarEntry() {
 }
 
 UIMenuBar::UIMenuBar(int width, UIGlobalMenu *globalMenu) : UIElement() {
+	Config *conf = CoreServices::getInstance()->getConfig();
 
 	this->globalMenu = globalMenu;
 
 	bgShape = new UIRect(width, 25);
 	addChild(bgShape);
-	bgShape->setColor(0.0, 0.0, 0.0, 1.0);
+	Color bgColor = new Color();
+	bgColor.setColorHexFromString(conf->getStringValue("Polycode", "uiMenuBarBgColor"));
+	bgShape->setColor(bgColor);
 	bgShape->setAnchorPoint(-1.0, -1.0, 0.0);
 	entryOffset = 0;
 
diff --git a/Modules/Contents/UI/Source/PolyUITextInput.cpp b/Modules/Contents/UI/Source/PolyUITextInput.cpp
diff --git a/Modules/Contents/UI/Source/PolyUITree.cpp b/Modules/Contents/UI/Source/PolyUITree.cpp
diff --git a/Modules/Contents/UI/Source/PolyUIVScrollBar.cpp b/Modules/Contents/UI/Source/PolyUIVScrollBar.cpp
