renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2088 from koreader/houqp-master

Browse Source 
uimanager(fix): handle last widget in broadcast event properly
This commit is contained in:
Huang Xin
2016-06-19 01:35:52 -05:00
committed by GitHub
parent 97925df40a af2f3c30c7
commit 48c414123b
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/ui/uimanager.lua
View File

@@ -418,8 +418,12 @@ function UIManager:broadcastEvent(event)
while (i <= #self._window_stack) do
local prev_widget = self._window_stack[i].widget
self._window_stack[i].widget:handleEvent(event)
if (self._window_stack[i].widget == prev_widget) then
i = i + 1
local top_widget = self._window_stack[i]
if top_widget == nil then
-- top widget closed itself
break
elseif (top_window.widget == prev_widget) then
i = i + 1
end
end
end

42
spec/unit/uimanager_spec.lua
View File

@@ -303,4 +303,46 @@ describe("UIManager spec", function()
assert.is.same(call_signals[2], 1)
assert.is.same(call_signals[3], 1)
end)
it("should handle stack change when broadcasting events", function()
UIManager._window_stack = {
{
widget = {
handleEvent = function()
UIManager._window_stack[1] = nil
end
}
},
}
UIManager:broadcastEvent("foo")
assert.is.same(#UIManager._window_stack, 0)
UIManager._window_stack = {
{
widget = {
handleEvent = function()
UIManager._window_stack[1] = nil
UIManager._window_stack[2] = nil
UIManager._window_stack[3] = nil
end
}
},
{
widget = {
handleEvent = function()
assert.falsy(true);
end
}
},
{
widget = {
handleEvent = function()
assert.falsy(true);
end
}
},
}
UIManager:broadcastEvent("foo")
assert.is.same(#UIManager._window_stack, 0)
end)
end)