Merge pull request #17 from britzl/resizefix

Replay transitions when the layout changes

README.md

@@ -240,3 +240,7 @@ Check if a Monarch screen exists.
 
 **RETURN**
 * ```exists``` (boolean) - True if the screen exists.
+
+
+### monarch.debug()
+Enable verbose logging of the internals of Monarch.

monarch/transitions/gui.lua

@@ -96,6 +96,8 @@ function M.create(node)
 
 	local transitions = {}
 
+	local current_transition = nil
+	
 	local initial_data = {}
 	initial_data.pos = gui.get_position(node)
 	initial_data.scale = gui.get_scale(node)
@@ -114,6 +116,7 @@ function M.create(node)
 	local function start_transition(transition, url)
 		table.insert(transition.urls, url)
 		if not transition.in_progress then
+			current_transition = transition
 			transition.in_progress = true
 			transition.fn(node, initial_data, transition.easing, transition.duration, transition.delay or 0, function()
 				transition.in_progress = false
@@ -129,6 +132,12 @@ function M.create(node)
 	function instance.handle(message_id, message, sender)
 		if message_id == LAYOUT_CHANGED then
 			initial_data.pos = gui.get_position(node)
+			-- replay the current transition if the layout changes
+			-- this will ensure that things are still hidden if they
+			-- were transitioned out
+			if current_transition then
+				current_transition.fn(node, initial_data, current_transition.easing, 0, 0)
+			end
 		else
 			local transition = transitions[message_id]
 			if transition then

test/test_monarch.lua

@@ -1,6 +1,7 @@
 local cowait = require "test.cowait"
 local monarch = require "monarch.monarch"
 
+local SCREEN1_STR = hash("screen1")
 local SCREEN1 = hash(SCREEN1_STR)
 local SCREEN2 = hash("screen2")
 local POPUP1 = hash("popup1")