progress bar and skills improve

modules/skills/skills.lua

@@ -28,9 +28,10 @@ function Skills.create()
     levelLabel:setId('skillLevelId' .. i)
     levelLabel:setText('0')
 
-    local percentPanel = UIWidget.create()
-    skillPanel:addChild(percentPanel)
-    percentPanel:setStyle('SkillPercentPanel')
+    local percentBar = UIProgressBar.create()
+    skillPanel:addChild(percentBar)
+    percentBar:setStyle('SkillPercentPanel')
+    percentBar:setId('skillPercentId' .. i)
   end
 end
 
@@ -46,8 +47,9 @@ function Game.onSkillUpdate(id, level, percent)
   local levelLabel = skillPanel:getChildById('skillLevelId' .. (id + 1))
   levelLabel:setText(level)
 
-  --local percentLabel = skillPanel:getChildById('skillLevelId' .. id)
-  --levelLabel:setText(percent)
+  local percentBar = skillPanel:getChildById('skillPercentId' .. (id + 1))
+  percentBar:setPercent(percent)
+  percentBar:setTooltip(percent .. "% to go")
 end
 
 connect(Game, { onLogin = Skills.create,

modules/skills/skills.lua~

@@ -28,9 +28,10 @@ function Skills.create()
     levelLabel:setId('skillLevelId' .. i)
     levelLabel:setText('0')
 
-    local percentPanel = UIWidget.create()
-    skillPanel:addChild(percentPanel)
-    percentPanel:setStyle('SkillPercentPanel')
+    local percentBar = UIProgressBar.create()
+    skillPanel:addChild(percentBar)
+    percentBar:setStyle('SkillPercentPanel')
+    percentBar:setId('skillPercentId' .. i)
   end
 end
 
@@ -40,14 +41,15 @@ function Skills.destroy()
 end
 
 -- hooked events
-function Game.setSkill(id, level, percent)
+function Game.onSkillUpdate(id, level, percent)
   local skillPanel = skillWindow:getChildById('skillPanel')
 
-  local levelLabel = skillPanel:getChildById('skillLevelId' .. id)
+  local levelLabel = skillPanel:getChildById('skillLevelId' .. (id + 1))
   levelLabel:setText(level)
 
-  --local percentLabel = skillPanel:getChildById('skillLevelId' .. id)
-  --levelLabel:setText(percent)
+  local percentBar = skillPanel:getChildById('skillPercentId' .. (id + 1))
+  percentBar:setPercent(percent)
+  percentBar:setTooltip("lalalalal2")
 end
 
 connect(Game, { onLogin = Skills.create,

modules/skills/skills.otui

@@ -1,11 +1,10 @@
 SkillFirstWidget < UIWidget
-  margin.top: 2
   anchors.top: parent.top
 
 SkillNameLabel < Label
   font: verdana-11px-monochrome
 
-  margin.top: 2
+  margin.top: 4
   margin.left: 10
   margin.right: 10
   anchors.top: prev.bottom
@@ -15,18 +14,18 @@ SkillNameLabel < Label
 SkillLevelLabel < Label
   font: verdana-11px-monochrome
   align: right
-  margin.top: 2
   margin.left: 10
   margin.right: 10
   anchors.top: prev.top
   anchors.left: parent.left
   anchors.right: parent.right
 
-SkillPercentPanel < UIWidget
-  color: blue
-  background-color: red
-  height: 4
-  margin.top: 2
+SkillPercentPanel < UIProgressBar
+  color: black
+  background-color: green
+  tooltip: test
+  height: 5
+  margin.top: 3
   margin.left: 10
   margin.right: 10
   anchors.top: prev.bottom
@@ -36,7 +35,7 @@ SkillPercentPanel < UIWidget
 MiniWindow
   id: skillWindow
   title: Skills
-  size: 200 185
+  size: 200 220
 
   Panel
     id: skillPanel
@@ -44,4 +43,4 @@ MiniWindow
     margin.top: 26
     margin.bottom: 3
     margin.left: 3
-    margin.right: 3
+    margin.right: 3

modules/tooltip/tooltip.lua

@@ -48,5 +48,10 @@ function ToolTip.hide()
   end
 end
 
+function UIWidget:setTooltip(text)
+  self:applyStyle({ tooltip = text })
+end
+
 -- hooks
 connect(UIButton, { onHoverChange = onButtonHoverChange})
+connect(UIProgressBar, { onHoverChange = onButtonHoverChange})