Author: tom
Date: Mon Nov 10 13:13:57 2008
New Revision: 3316
URL: http://svn.slimdevices.com?rev=3316&root=Jive&view=rev
Log:
Bug 9842:
Description:
- skins are now resizable.
- when new skin is selected, resize to it's default size
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3316&root=Jive&r1=3315&r2=3316&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Mon Nov 10 13:13:57 2008
@@ -99,10 +99,15 @@
-- skin
-- The meta arranges for this to be called to skin Jive.
-function skin(self, s)
- Framework:setVideoMode(240, 320, 16, jiveMain:isFullscreen())
-
+function skin(self, s, reload, useDefaultSize)
local screenWidth, screenHeight = Framework:getScreenSize()
+ if useDefaultSize or screenWidth < 240 or screenHeight < 320 then
+ screenWidth = 240
+ screenHeight = 320
+ log:warn("******* RESIZING")
+ end
+
+ Framework:setVideoMode(screenWidth, screenHeight, 16,
jiveMain:isFullscreen())
-- Images and Tiles
local iconBackground =
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=3316&root=Jive&r1=3315&r2=3316&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Mon Nov 10
13:13:57 2008
@@ -351,7 +351,7 @@
-- reset the skin
jive.ui.style = {}
- obj[method](obj, jive.ui.style, reload==nil and true or relaod)
+ obj[method](obj, jive.ui.style, reload==nil and true or relaod,
useDefaultSize)
Framework:styleChanged()
@@ -368,9 +368,9 @@
end
-function JiveMain:setSelectedSkin(appletName, reload)
+function JiveMain:setSelectedSkin(appletName)
log:warn(appletName)
- if _loadSkin(self, appletName, false) then
+ if _loadSkin(self, appletName, false, true) then
self.selectedSkin = appletName
end
end
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=3316&root=Jive&r1=3315&r2=3316&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Mon Nov 10
13:13:57 2008
@@ -1275,6 +1275,9 @@
next_jive_origin++;
jevent.type = JIVE_EVENT_WINDOW_RESIZE;
+
+ /* Avoid mouse_up causing a mouse press event to occur */
+ mouse_state = MOUSE_STATE_NONE;
break;
}
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3316&root=Jive&r1=3315&r2=3316&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Mon Nov 10 13:13:57 2008
@@ -115,10 +115,16 @@
-- skin
-- The meta arranges for this to be called to skin Jive.
-function skin(self, s)
- Framework:setVideoMode(800, 600, 32, jiveMain:isFullscreen())
-
+function skin(self, s, reload, useDefaultSize)
local screenWidth, screenHeight = Framework:getScreenSize()
+
+ if screenWidth < 800 or screenHeight < 600 then
+ screenWidth = 800
+ screenHeight = 600
+ log:warn("******* RESIZING")
+ end
+
+ Framework:setVideoMode(screenWidth, screenHeight, 32,
jiveMain:isFullscreen())
-- Images and Tiles
local iconBackground =
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
