implement more functionality

* update TODO
* rework UISpinBox
* restore move of stackable items and with horizontal scrollbar
* implement classic control look

modules/core_lib/mouse.lua

@@ -26,8 +26,9 @@ function Mouse.isCursorChanged()
   return cursorChanged
 end
 
-function Mouse.isPressed()
-  return g_ui.getPressedWidget() ~= nil
+function Mouse.isPressed(button)
+  if not button then button = MouseLeftButton end
+  return g_window.isMouseButtonPressed(button)
 end
 
 function Mouse.bindAutoPress(widget, callback)

modules/core_lib/widgets/uiscrollbar.lua

@@ -180,9 +180,17 @@ end
 
 function UIScrollBar:onMouseWheel(mousePos, mouseWheel)
   if mouseWheel == MouseWheelUp then
-    self:decrement()
+    if self.orientation == 'vertical' then
+      self:decrement()
+    else
+      self:increment()
+    end
   else
-    self:increment()
+    if self.orientation == 'vertical' then
+      self:increment()
+    else
+      self:decrement()
+    end
   end
   return true
 end

modules/core_lib/widgets/uispinbox.lua

@@ -5,60 +5,23 @@ function UISpinBox.create()
   spinbox:setValidCharacters('0123456789')
   spinbox.minimum = 0
   spinbox.maximum = 0
-  spinbox:setCurrentIndex(0)
+  spinbox.value = 0
   spinbox:setText("0")
   return spinbox
 end
 
-function UISpinBox:setCurrentIndex(index)
-  if index >= self.minimum and index <= self.maximum then
-    if self:getText():len() > 0 then
-      self:setText(index)
-    end
-    self.currentIndex = index
-    self:onIndexChange(index)
-  end
-end
-
-function UISpinBox:setMinimum(minimum)
-  if minimum > self.maximum then
-    print("[UISpinBox:setMinimum]: minimum value cant be greater than maximum")
-    return false
-  end
-  if self.currentIndex < minimum then
-    self:setCurrentIndex(minimum)
-  end
-  self.minimum = minimum
-end
-
-function UISpinBox:setMaximum(maximum)
-  if maximum < self.minimum then
-    print("[UISpinBox:setMaximum]: maximum value cant be lower than minimum")
-    return false
-  end
-  if self.currentIndex > maximum then
-    self:setCurrentIndex(maximum)
-  end
-  self.maximum = maximum
-end
-
-function UISpinBox:getCurrentIndex()
-  return self.currentIndex
-end
-
 function UISpinBox:onMouseWheel(mousePos, direction)
   if direction == MouseWheelUp then
-    self:setCurrentIndex(self.currentIndex + 1)
+    self:setValue(self.value + 1)
   elseif direction == MouseWheelDown then
-    self:setCurrentIndex(self.currentIndex - 1)
+    self:setValue(self.value - 1)
   end
   return true
 end
 
 function UISpinBox:onTextChange(text, oldText)
-
   if text:len() == 0 then
-    self:setCurrentIndex(self.minimum)
+    self:setValue(self.minimum)
     return
   end
 
@@ -68,21 +31,45 @@ function UISpinBox:onTextChange(text, oldText)
     return
   end
   
-  self:setCurrentIndex(number)
+  self:setValue(number)
 end
 
-function UISpinBox:onIndexChange(index)
+function UISpinBox:onValueChange(value)
   -- nothing todo
 end
 
 function UISpinBox:onStyleApply(styleName, styleNode)
-  -- tonumber converts to 0 if not valid
-  if styleNode.maximum and tonumber(styleNode.maximum) then
-    self:setMaximum(tonumber(styleNode.maximum))
-  end
-  
-  if styleNode.minimum and tonumber(styleNode.minimum) then
-    self:setMinimum(tonumber(styleNode.minimum))
+  for name, value in pairs(styleNode) do
+    if name == 'maximum' then
+      self:setMaximum(value)
+    elseif name == 'minimum' then
+      self:setMinimum(value)
+    end
   end
 end
 
+function UISpinBox:setValue(value)
+  value = math.max(math.min(self.maximum, value), self.minimum)
+  if value == self.value then return end
+  if self:getText():len() > 0 then
+    self:setText(value)
+  end
+  self.value = value
+  signalcall(self.onValueChange, self, value)
+end
+
+function UISpinBox:setMinimum(minimum)
+  self.minimum = minimum
+  if self.value < minimum then
+    self:setValue(minimum)
+  end
+end
+
+function UISpinBox:setMaximum(maximum)
+  self.maximum = maximum
+  if self.value > maximum then
+    self:setValue(maximum)
+  end
+end
+
+function UISpinBox:getValue() return self.value end