Author: titmuss
Date: Mon Jan 14 07:12:03 2008
New Revision: 1431
URL: http://svn.slimdevices.com?rev=1431&root=Jive&view=rev
Log:
Bug: N/A
Description:
Always on top is not a sensible default for popup windows.
Fix the hide/inactive notifications for windows under transparent ones.
Modified:
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
trunk/jive/src/pkg/jive/share/jive/ui/Popup.lua
trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
Modified: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1431&root=Jive&r1=1430&r2=1431&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Mon Jan 14 07:12:03 2008
@@ -480,6 +480,7 @@
-- create window to display current song info
self.currentSong.window = Popup("currentsong")
self.currentSong.window:setAllowScreensaver(true)
+ self.currentSong.window:setAlwaysOnTop(true)
self.currentSong.artIcon = Icon("icon")
self.currentSong.text = Label("text", "")
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Popup.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Popup.lua?rev=1431&root=Jive&r1=1430&r2=1431&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Popup.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Popup.lua Mon Jan 14 07:12:03 2008
@@ -61,7 +61,6 @@
obj._DEFAULT_HIDE_TRANSITION = Window.transitionNone
obj:setAllowScreensaver(false)
- obj:setAlwaysOnTop(true)
obj:setAutoHide(true)
obj:setShowFrameworkWidgets(false)
obj:setTransparent(true)
@@ -75,24 +74,6 @@
end)
return obj
-end
-
-
---[[
-
-=head2 jive.ui.Popup:lowerWindow(widget)
-
-Returns the window beneath this popup.
-
-=cut
---]]
-function getLowerWindow(self)
- for i = 1,#Framework.windowStack do
- if Framework.windowStack[i] == self then
- return Framework.windowStack[i + 1]
- end
- end
- return nil
end
Modified: trunk/jive/src/pkg/jive/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/ui/Window.lua?rev=1431&root=Jive&r1=1430&r2=1431&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/ui/Window.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/ui/Window.lua Mon Jan 14 07:12:03 2008
@@ -320,7 +320,9 @@
-- push transitions
transition = transition or self._DEFAULT_HIDE_TRANSITION
Framework:_startTransition(_newTransition(transition, self,
topWindow))
-
+ end
+
+ if self.visible then
-- this window and widgets are now not visible
self:dispatchNewEvent(EVENT_HIDE)
@@ -481,6 +483,24 @@
--]]
function getWindow(self)
return self
+end
+
+
+--[[
+
+=head2 jive.ui.Popup:lowerWindow(widget)
+
+Returns the window beneath this popup.
+
+=cut
+--]]
+function getLowerWindow(self)
+ for i = 1,#Framework.windowStack do
+ if Framework.windowStack[i] == self then
+ return Framework.windowStack[i + 1]
+ end
+ end
+ return nil
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
