Merge pull request #237 from Courseplay/Gui-Additions

Gui additions

Author: Tensuko

scripts/gui/CpInGameMenu.lua

@@ -290,9 +290,11 @@ function CpInGameMenu:onClickMenu()
 end
 
 function CpInGameMenu:onPageChange(pageIndex, pageMappingIndex, element, skipTabVisualUpdate)
-
 	CpInGameMenu:superClass().onPageChange(self, pageIndex, pageMappingIndex, element, skipTabVisualUpdate)
 	self:updateBackground()
+	if self.currentPage.categoryHeaderIcon then
+		self.currentPage.categoryHeaderIcon:setImageSlice(nil, self.pageTabs[self.currentPage].iconSliceId)
+	end
 end
 
 function CpInGameMenu:getPageButtonInfo(page)

scripts/gui/CustomFieldHotspot.lua

@@ -75,3 +75,6 @@ function CustomFieldHotspot:getAreaText()
     return g_i18n:formatArea(self.field:getAreaInSqMeters()/10000 , 2)
 end
 
+function CustomFieldHotspot:getIsVisible()
+	return CustomFieldHotspot:superClass().getIsVisible(self) and g_cpInGameMenu.isOpen
+end

scripts/gui/pages/CpCourseGeneratorFrame.lua

@@ -209,7 +209,10 @@ function CpCourseGeneratorFrame:initialize(menu)
 	self.subCategoryBox:invalidateLayout()
 	self.subCategoryPaging:setSize(self.subCategoryBox.maxFlowSize + 140 * g_pixelSizeScaledX)
 
-	self.hotspotFilterCategories = table.clone(InGameMenuMapFrame.HOTSPOT_FILTER_CATEGORIES)
+	self.hotspotFilterCategories = {}
+	for i, v in pairs(InGameMenuMapFrame.HOTSPOT_FILTER_CATEGORIES) do 
+		self.hotspotFilterCategories[i] = table.clone(v)
+	end
 	table.insert(self.hotspotFilterCategories[2], {
 		["id"] = CustomFieldHotspot.CATEGORY,
 		["sliceId"] = CustomFieldHotspot.SLICE_ID,

scripts/gui/pages/CpHelpFrame.lua

@@ -46,28 +46,31 @@ end
 
 function CpHelpFrame:onFrameOpen()
 	CpHelpFrame:superClass().onFrameOpen(self)
-	self.customEnvironments = self.helpLineManager:getCustomEnvironmentNames()
-	local texts = {}
-	for _, env in ipairs(self.customEnvironments) do 
-		if string.isNilOrWhitespace(env) then 
-			--table.insert(texts, g_i18n:getText("ui_helpLine_baseGame"))
-		else 
-			local mod = g_modManager:getModByName(env)
-			if mod then 
-				table.insert(texts, mod.title)
+	if not self.wasOpened then
+		self.customEnvironments = self.helpLineManager:getCustomEnvironmentNames()
+		local texts = {}
+		for _, env in ipairs(self.customEnvironments) do 
+			if string.isNilOrWhitespace(env) then 
+				--table.insert(texts, g_i18n:getText("ui_helpLine_baseGame"))
 			else 
-				table.insert(texts, "Unknown")
+				local mod = g_modManager:getModByName(env)
+				if mod then 
+					table.insert(texts, mod.title)
+				else 
+					table.insert(texts, "Unknown")
+				end
+			end	
+		end
+		self.helpLineSelector:setTexts(texts)
+		for i = 1, #self.helpLineSelector.texts do
+			local dot = self.helpLineDotTemplate:clone(self.helpLineDotBox)
+			dot.getIsSelected = function ()
+				return self.helpLineSelector:getState() == i
 			end
-		end	
-	end
-	self.helpLineSelector:setTexts(texts)
-	for i = 1, #self.helpLineSelector.texts do
-		local dot = self.helpLineDotTemplate:clone(self.helpLineDotBox)
-		dot.getIsSelected = function ()
-			return self.helpLineSelector:getState() == i
 		end
+		self.helpLineDotBox:invalidateLayout()
+		self.wasOpened = true
 	end
-	self.helpLineDotBox:invalidateLayout()
 	self.helpLineList:reloadData()
 	self:setSoundSuppressed(true)
 	FocusManager:setFocus(self.helpLineList)