Skip to content

Fix resource element handling and obsolete variable in helpmanager #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iManGaaX wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −6
Open

Fix resource element handling and obsolete variable in helpmanager #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions [managers]/helpmanager/helpmanager_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ addEventHandler("onClientResourceStart", resourceRoot,

addEventHandler("onClientGUIClick", btnClose,
function()
if source == this then
if source == btnClose then
clientToggleHelp(false)
end
end
end, false
)

pagesXml = xmlLoadFile("seen.xml")
if not pagesXml then
pagesXml = xmlCreateFile("seen.xml", "seen")
end

for i, resourceRoot in ipairs(getElementsByType("resource")) do --!w
local resource = getResourceFromName(getElementID(resourceRoot))
for i, resRoot in ipairs(getElementsByType("resource")) do
local resource = getResourceFromName(getElementID(resRoot))
if resource then
addHelpTabFromXML(resource)
end
Expand Down Expand Up @@ -102,7 +102,11 @@ function addHelpTab(resource, showPopup)
end

function removeHelpTab(resource)
if not tab[resource] then
if type(resource) ~= "userdata" then
resource = getResourceFromName(getElementID(source))
end

if not resource or not tab[resource] then
return false
end

Expand All @@ -120,6 +124,12 @@ addEventHandler("onClientResourceStop", root, removeHelpTab)

--private
function addHelpTabFromXML(resource)
if type(resource) ~= "userdata" then
resource = getResourceFromName(getElementID(source))
end

if not resource then return false end

-- block duplicates
if tab[resource] then
return false
Expand Down Expand Up @@ -156,6 +166,10 @@ end

local function fadeIn(wnd)
local function raiseAlpha()
if not isElement(wnd) then
removeEventHandler("onClientRender", root, raiseAlpha)
return
end
local newAlpha = guiGetAlpha(wnd) + FADE_DELTA
if newAlpha <= MAX_ALPHA then
guiSetAlpha(wnd, newAlpha)
Expand All @@ -168,6 +182,10 @@ end

local function fadeOut(wnd)
local function lowerAlpha()
if not isElement(wnd) then
removeEventHandler("onClientRender", root, lowerAlpha)
return
end
local newAlpha = guiGetAlpha(wnd) - FADE_DELTA
if newAlpha >= 0 then
guiSetAlpha(wnd, newAlpha)
Expand Down Expand Up @@ -204,7 +222,7 @@ end

function showHelpPopup(resource)
local screenX, screenY = guiGetScreenSize()
local wndPopup = guiCreateWindow(0, screenY - 20, screenX, 0, '', false) --350
local wndPopup = guiCreateWindow(0, screenY - 20, screenX, 0, '', false)

local restitle = getResourceName(resource)
local helpnode = getResourceConfig(":" .. getResourceName(resource) .. "/help.xml")
Expand Down