Author: titmuss
Date: Tue Apr 29 06:02:03 2008
New Revision: 2387
URL: http://svn.slimdevices.com?rev=2387&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added a new layer LAYER_LOWER that is used for drawing all widgets under
transparent
windows. This allows the macro tests to capture screenshots without the
transparency,
allowing more reliable image comparision.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
Tue Apr 29 06:02:03 2008
@@ -39,7 +39,8 @@
local debug = require("jive.utils.debug")
local log = require("jive.utils.log").logger("applets.misc")
-local LAYER_ALL = jive.ui.LAYER_ALL
+local LAYER_CONTENT = jive.ui.LAYER_CONTENT
+local LAYER_FRAME = jive.ui.LAYER_FRAME
local jive = jive
@@ -425,7 +426,7 @@
local window = Framework.windowStack[1]
local screen = Surface:newRGB(w, h)
- window:draw(screen, LAYER_ALL)
+ window:draw(screen, LAYER_FRAME | LAYER_CONTENT)
local reffile = self.macrodir .. file .. ".bmp"
if lfs.attributes(reffile, "mode") == "file" then
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Tue Apr 29
06:02:03 2008
@@ -76,6 +76,7 @@
local LAYER_CONTENT_OFF_STAGE = jive.ui.LAYER_CONTENT_OFF_STAGE
local LAYER_CONTENT_ON_STAGE = jive.ui.LAYER_CONTENT_ON_STAGE
local LAYER_FRAME = jive.ui.LAYER_FRAME
+local LAYER_LOWER = jive.ui.LAYER_LOWER
local LAYOUT_NORTH = jive.ui.LAYOUT_NORTH
local LAYOUT_EAST = jive.ui.LAYOUT_EAST
@@ -752,7 +753,7 @@
return function(widget, surface)
local x = frames * 3
- self:draw(surface, LAYER_FRAME)
+ self:draw(surface, LAYER_FRAME | LAYER_LOWER)
surface:setOffset(x, 0)
self:draw(surface, LAYER_CONTENT |
LAYER_CONTENT_OFF_STAGE | LAYER_CONTENT_ON_STAGE)
surface:setOffset(0, 0)
@@ -781,7 +782,7 @@
return function(widget, surface)
local x = frames * 3
- self:draw(surface, LAYER_FRAME)
+ self:draw(surface, LAYER_FRAME | LAYER_LOWER)
surface:setOffset(-x, 0)
self:draw(surface, LAYER_CONTENT |
LAYER_CONTENT_OFF_STAGE | LAYER_CONTENT_ON_STAGE)
surface:setOffset(0, 0)
@@ -814,7 +815,7 @@
local x = screenWidth - ((frames * frames * frames) /
scale)
surface:setOffset(0, 0)
- newWindow:draw(surface, LAYER_FRAME)
+ newWindow:draw(surface, LAYER_FRAME | LAYER_LOWER)
surface:setOffset(-x, 0)
oldWindow:draw(surface, LAYER_CONTENT |
LAYER_CONTENT_OFF_STAGE)
@@ -852,7 +853,7 @@
local x = screenWidth - ((frames * frames * frames) /
scale)
surface:setOffset(0, 0)
- newWindow:draw(surface, LAYER_FRAME)
+ newWindow:draw(surface, LAYER_FRAME | LAYER_LOWER)
surface:setOffset(x, 0)
oldWindow:draw(surface, LAYER_CONTENT |
LAYER_CONTENT_OFF_STAGE)
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h Tue Apr 29 06:02:03 2008
@@ -65,6 +65,7 @@
JIVE_LAYER_CONTENT = 0x02,
JIVE_LAYER_CONTENT_OFF_STAGE = 0x04,
JIVE_LAYER_CONTENT_ON_STAGE = 0x08,
+ JIVE_LAYER_LOWER = 0x10,
JIVE_LAYER_ALL = 0xFF,
} JiveLayer;
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c Tue Apr 29
06:02:03 2008
@@ -210,7 +210,7 @@
lua_pushvalue(L, 1);
lua_call(L, 1, 1);
- if ((layer & JIVE_LAYER_FRAME) && jive_getmethod(L, -1,
"draw")) {
+ if ((layer & JIVE_LAYER_LOWER) && jive_getmethod(L, -1,
"draw")) {
lua_pushvalue(L, -2);
lua_pushvalue(L, 2);
lua_pushinteger(L, JIVE_LAYER_ALL);
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c Tue Apr 29
06:02:03 2008
@@ -1,6 +1,6 @@
/*
** Lua binding: jive
-** Generated automatically by tolua++-1.0.92 on Fri Apr 11 00:01:23 2008.
+** Generated automatically by tolua++-1.0.92 on Sun Apr 13 12:55:28 2008.
*/
#ifndef __cplusplus
@@ -2175,6 +2175,7 @@
tolua_constant(tolua_S,"LAYER_CONTENT",JIVE_LAYER_CONTENT);
tolua_constant(tolua_S,"LAYER_CONTENT_OFF_STAGE",JIVE_LAYER_CONTENT_OFF_STAGE);
tolua_constant(tolua_S,"LAYER_CONTENT_ON_STAGE",JIVE_LAYER_CONTENT_ON_STAGE);
+ tolua_constant(tolua_S,"LAYER_LOWER",JIVE_LAYER_LOWER);
tolua_constant(tolua_S,"LAYER_ALL",JIVE_LAYER_ALL);
tolua_constant(tolua_S,"EVENT_NONE",JIVE_EVENT_NONE);
tolua_constant(tolua_S,"EVENT_SCROLL",JIVE_EVENT_SCROLL);
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg?rev=2387&root=Jive&r1=2386&r2=2387&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg Tue Apr 29
06:02:03 2008
@@ -71,6 +71,7 @@
JIVE_LAYER_CONTENT @ LAYER_CONTENT = 0x02,
JIVE_LAYER_CONTENT_OFF_STAGE @ LAYER_CONTENT_OFF_STAGE = 0x04,
JIVE_LAYER_CONTENT_ON_STAGE @ LAYER_CONTENT_ON_STAGE = 0x08,
+ JIVE_LAYER_LOWER @ LAYER_LOWER = 0x10,
JIVE_LAYER_ALL @ LAYER_ALL = 0xFF,
} Layer;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
