Author: tom
Date: Mon Mar 30 12:23:55 2009
New Revision: 5021
URL: http://svn.slimdevices.com/jive?rev=5021&view=rev
Log:
Bug:N/A
Description:
iconbar icons were being drawn above help windows.
Now, framework widgets added to iterator list first so that if default zorder
is used, framework widgets are drawn first.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=5021&r1=5020&r2=5021&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Mon Mar 30
12:23:55 2009
@@ -1478,16 +1478,11 @@
local stableSortCounter = 1
self.zWidgets = {}
- for i, widget in ipairs(self.widgets) do
- if widget then
- widget._stableSortIndex = stableSortCounter
- table.insert(self.zWidgets, widget)
-
- stableSortCounter = stableSortCounter + 1
- end
- end
-
if self:getShowFrameworkWidgets() then
+ --framework widgets added to iterator list first so that if
default zorder is used,
+ -- framework widgets are drawn first - This is needed
+ -- to support, for instance, the SeupLanguage screen where
iconbar (a framework widget) is shown behind
+ -- a mini-help window.
for i, widget in ipairs(Framework:getWidgets()) do
if widget then
widget._stableSortIndex = stableSortCounter
@@ -1496,6 +1491,16 @@
end
end
end
+
+ for i, widget in ipairs(self.widgets) do
+ if widget then
+ widget._stableSortIndex = stableSortCounter
+ table.insert(self.zWidgets, widget)
+
+ stableSortCounter = stableSortCounter + 1
+ end
+ end
+
table.sort(self.zWidgets,
function(a, b)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
