Reimplement text edit scrolling in C++

* And update some corelib APIs

modules/corelib/ui/tooltip.lua

@@ -12,7 +12,7 @@ local function moveToolTip(first)
   local pos = g_window.getMousePosition()
   pos.y = pos.y + 1
   local xdif = g_window.getSize().width - (pos.x + toolTipLabel:getWidth())
-  if xdif < 2 then
+  if xdif < 10 then
     pos.x = pos.x - toolTipLabel:getWidth() - 3
   else
     pos.x = pos.x + 10

modules/corelib/ui/uicombobox.lua

@@ -3,6 +3,7 @@ UIComboBox = extends(UIWidget)
 
 function UIComboBox.create()
   local combobox = UIComboBox.internalCreate()
+  combobox:setFocusable(false)
   combobox.options = {}
   combobox.currentIndex = -1
   combobox.mouseScroll = true
@@ -15,6 +16,15 @@ function UIComboBox:clearOptions()
   self:clearText()
 end
 
+function UIComboBox:getOption(text)
+  if not self.options then return nil end
+  for i,v in ipairs(self.options) do
+    if v.text == text then
+      return nil
+    end
+  end
+end
+
 function UIComboBox:setCurrentOption(text)
   if not self.options then return end
   for i,v in ipairs(self.options) do
@@ -27,6 +37,18 @@ function UIComboBox:setCurrentOption(text)
   end
 end
 
+function UIComboBox:setCurrentOptionByData(data)
+  if not self.options then return end
+  for i,v in ipairs(self.options) do
+    if v.data == data and self.currentIndex ~= i then
+      self.currentIndex = i
+      self:setText(v.text)
+      self:onOptionChange(v.text, v.data)
+      return
+    end
+  end
+end
+
 function UIComboBox:setCurrentIndex(index)
   if index >= 1 and index <= #self.options then
     local v = self.options[index]

modules/corelib/ui/uiinputbox.lua

@@ -0,0 +1,114 @@
+if not UIWindow then dofile 'uiwindow' end
+
+-- @docclass
+UIInputBox = extends(UIWindow)
+
+function UIInputBox.create(title, okCallback, cancelCallback)
+  local inputBox = UIInputBox.internalCreate()
+
+  inputBox:setText(title)
+  inputBox.inputs = {}
+  inputBox.onEnter = function()
+    local results = {}
+    for _,func in pairs(inputBox.inputs) do
+      table.insert(results, func())
+    end
+    okCallback(unpack(results))
+    inputBox:destroy()
+  end
+  inputBox.onEscape = function()
+    if cancelCallback then
+      cancelCallback()
+    end
+    inputBox:destroy()
+  end
+
+  return inputBox
+end
+
+function UIInputBox:addLabel(text)
+  local label = g_ui.createWidget('InputBoxLabel', self)
+  label:setText(text)
+  return label
+end
+
+function UIInputBox:addLineEdit(labelText, defaultText, maxLength)
+  if labelText then self:addLabel(labelText) end
+  local lineEdit = g_ui.createWidget('InputBoxLineEdit', self)
+  if defaultText then lineEdit:setText(defaultText) end
+  if maxLength then lineEdit:setMaxLength(maxLength) end
+  table.insert(self.inputs, function() return lineEdit:getText() end)
+  return lineEdit
+end
+
+function UIInputBox:addTextEdit(labelText, defaultText, maxLength, visibleLines)
+  if labelText then self:addLabel(labelText) end
+  local textEdit = g_ui.createWidget('InputBoxTextEdit', self)
+  if defaultText then textEdit:setText(defaultText) end
+  if maxLength then textEdit:setMaxLength(maxLength) end
+  visibleLines = visibleLines or 1
+  textEdit:setHeight(textEdit:getHeight() * visibleLines)
+  table.insert(self.inputs, function() return textEdit:getText() end)
+  return textEdit
+end
+
+function UIInputBox:addCheckBox(text, checked)
+  local checkBox = g_ui.createWidget('InputBoxCheckBox', self)
+  checkBox:setText(text)
+  checkBox:setChecked(checked)
+  table.insert(self.inputs, function() return checkBox:isChecked() end)
+  return checkBox
+end
+
+function UIInputBox:addComboBox(labelText, ...)
+  if labelText then self:addLabel(labelText) end
+  local comboBox = g_ui.createWidget('InputBoxComboBox', self)
+  local options = {...}
+  for i=1,#options do
+    comboBox:addOption(options[i])
+  end
+  table.insert(self.inputs, function() return comboBox:getCurrentOption() end)
+  return comboBox
+end
+
+function UIInputBox:addSpinBox(labelText, minimum, maximum, value, step)
+  if labelText then self:addLabel(labelText) end
+  local spinBox = g_ui.createWidget('InputBoxSpinBox', self)
+  spinBox:setMinimum(minimum)
+  spinBox:setMaximum(maximum)
+  spinBox:setValue(value)
+  spinBox:setStep(step)
+  table.insert(self.inputs, function() return spinBox:getValue() end)
+  return spinBox
+end
+
+function UIInputBox:display(okButtonText, cancelButtonText)
+  okButtonText = okButtonText or tr('Ok')
+  cancelButtonText = cancelButtonText or tr('Cancel')
+
+  local buttonsWidget = g_ui.createWidget('InputBoxButtonsPanel', self)
+  local okButton = g_ui.createWidget('InputBoxButton', buttonsWidget)
+  okButton:setText(okButtonText)
+  okButton.onClick = self.onEnter
+
+  local cancelButton = g_ui.createWidget('InputBoxButton', buttonsWidget)
+  cancelButton:setText(cancelButtonText)
+  cancelButton.onClick = self.onEscape
+
+  buttonsWidget:setHeight(okButton:getHeight())
+
+  rootWidget:addChild(self)
+  self:setStyle('InputBoxWindow')
+end
+
+function displayTextInputBox(title, label, okCallback, cancelCallback)
+  local inputBox = UIInputBox.create(title, okCallback, cancelCallback)
+  inputBox:addLineEdit(label)
+  inputBox:display()
+end
+
+function displayNumberInputBox(title, label, okCallback, cancelCallback, min, max, value, step)
+  local inputBox = UIInputBox.create(title, okCallback, cancelCallback)
+  inputBox:addSpinBox(label, min, max, value, step)
+  inputBox:display()
+end

modules/corelib/ui/uipopupmenu.lua

@@ -22,10 +22,14 @@ function UIPopupMenu:display(pos)
     currentMenu:destroy()
   end
 
+  if pos == nil then
+    pos = g_window.getMousePosition()
+  end
+
   rootWidget:addChild(self)
   self:setPosition(pos)
   self:grabMouse()
-  self:grabKeyboard()
+  --self:grabKeyboard()
   currentMenu = self
 end
 

modules/corelib/ui/uiprogressbar.lua

@@ -6,6 +6,10 @@ function UIProgressBar.create()
   progressbar:setFocusable(false)
   progressbar:setPhantom(true)
   progressbar.percent = 0
+  progressbar.bgBorderLeft = 0
+  progressbar.bgBorderRight = 0
+  progressbar.bgBorderTop = 0
+  progressbar.bgBorderBottom = 0
   progressbar:updateBackground()
   return progressbar
 end
@@ -25,11 +29,30 @@ function UIProgressBar:getPercentPixels()
 end
 
 function UIProgressBar:updateBackground()
-  local width = math.round(math.max((self.percent * self:getWidth())/100, 1))
-  local height = self:getHeight()
-  self:setBackgroundSize({width=width, height=height})
+  local width = math.round(math.max((self.percent * (self:getWidth() - self.bgBorderLeft - self.bgBorderRight))/100, 1))
+  local height = self:getHeight() - self.bgBorderTop - self.bgBorderBottom
+  local rect = { x = self.bgBorderLeft, y = self.bgBorderTop, width = width, height = height }
+  self:setBackgroundRect(rect)
 end
 
+function UIProgressBar:onStyleApply(name, node)
+  for name,value in pairs(node) do
+    if name == 'background-border-left' then
+      self.bgBorderLeft = tonumber(value)
+    elseif name == 'background-border-right' then
+      self.bgBorderRight = tonumber(value)
+    elseif name == 'background-border-top' then
+      self.bgBorderTop = tonumber(value)
+    elseif name == 'background-border-bottom' then
+      self.bgBorderBottom = tonumber(value)
+    elseif name == 'background-border' then
+      self.bgBorderLeft = tonumber(value)
+      self.bgBorderRight = tonumber(value)
+      self.bgBorderTop = tonumber(value)
+      self.bgBorderBottom = tonumber(value)
+    end
+  end
+end
 
 function UIProgressBar:onGeometryChange(oldRect, newRect)
   self:updateBackground()

modules/corelib/ui/uispinbox.lua

@@ -3,11 +3,14 @@ UISpinBox = extends(UITextEdit)
 
 function UISpinBox.create()
   local spinbox = UISpinBox.internalCreate()
+  spinbox:setFocusable(false)
   spinbox:setValidCharacters('0123456789')
   spinbox.displayButtons = true
   spinbox.minimum = 0
   spinbox.maximum = 0
   spinbox.value = 0
+  spinbox.step = 1
+  spinbox.firstchange = true
   spinbox:setText("0")
   return spinbox
 end
@@ -21,6 +24,14 @@ function UISpinBox:onMouseWheel(mousePos, direction)
   return true
 end
 
+function UISpinBox:onKeyPress()
+  if self.firstchange then
+    self.firstchange = false
+    self:setText('')
+  end
+  return false
+end
+
 function UISpinBox:onTextChange(text, oldText)
   if text:len() == 0 then
     self:setValue(self.minimum)
@@ -79,14 +90,15 @@ function UISpinBox:hideButtons()
 end
 
 function UISpinBox:up()
-  self:setValue(self.value + 1)
+  self:setValue(self.value + self.step)
 end
 
 function UISpinBox:down()
-  self:setValue(self.value - 1)
+  self:setValue(self.value - self.step)
 end
 
 function UISpinBox:setValue(value)
+  value = value or 0
   value = math.max(math.min(self.maximum, value), self.minimum)
   if value == self.value then return end
   if self:getText():len() > 0 then
@@ -107,6 +119,7 @@ function UISpinBox:setValue(value)
 end
 
 function UISpinBox:setMinimum(minimum)
+  minimum = minimum or -9223372036854775808
   self.minimum = minimum
   if self.minimum > self.maximum then
     self.maximum = self.minimum
@@ -117,12 +130,17 @@ function UISpinBox:setMinimum(minimum)
 end
 
 function UISpinBox:setMaximum(maximum)
+  maximum = maximum or 9223372036854775807
   self.maximum = maximum
   if self.value > maximum then
     self:setValue(maximum)
   end
 end
 
+function UISpinBox:setStep(step)
+  self.step = step or 1
+end
+
 function UISpinBox:getValue()
   return self.value
 end

modules/corelib/ui/uitabbar.lua

@@ -193,6 +193,9 @@ function UITabBar:selectTab(tab)
   tab:setChecked(true)
   tab:setOn(false)
   tab.blinking = false
+
+  local parent = tab:getParent()
+  parent:focusChild(tab, MouseFocusReason)
 end
 
 function UITabBar:selectNextTab()

modules/corelib/ui/uitextedit.lua

@@ -0,0 +1,77 @@
+function UITextEdit:onStyleApply(styleName, styleNode)
+  for name,value in pairs(styleNode) do
+    if name == 'vertical-scrollbar' then
+      addEvent(function()
+        self:setVerticalScrollBar(self:getParent():getChildById(value))
+      end)
+    elseif name == 'horizontal-scrollbar' then
+      addEvent(function()
+        self:setHorizontalScrollBar(self:getParent():getChildById(value))
+      end)
+    end
+  end
+end
+
+function UITextEdit:onMouseWheel(mousePos, mouseWheel)
+  if self.verticalScrollBar and self:isMultiline() then
+    if mouseWheel == MouseWheelUp then
+      self.verticalScrollBar:decrement()
+    else
+      self.verticalScrollBar:increment()
+    end
+  elseif self.horizontalScrollBar then
+    if mouseWheel == MouseWheelUp then
+      self.horizontalScrollBar:increment()
+    else
+      self.horizontalScrollBar:decrement()
+    end
+  end
+  return true
+end
+
+function UITextEdit:onTextAreaUpdate(virtualOffset, virtualSize, totalSize)
+  self:updateScrollBars()
+end
+
+function UITextEdit:setVerticalScrollBar(scrollbar)
+  self.verticalScrollBar = scrollbar
+  self.verticalScrollBar.onValueChange = function(scrollbar, value)
+    local virtualOffset = self:getTextVirtualOffset()
+    virtualOffset.y = value
+    self:setTextVirtualOffset(virtualOffset)
+  end
+  self:updateScrollBars()
+end
+
+function UITextEdit:setHorizontalScrollBar(scrollbar)
+  self.horizontalScrollBar = scrollbar
+  self.horizontalScrollBar.onValueChange = function(scrollbar, value)
+    local virtualOffset = self:getTextVirtualOffset()
+    virtualOffset.x = value
+    self:setTextVirtualOffset(virtualOffset)
+  end
+  self:updateScrollBars()
+end
+
+function UITextEdit:updateScrollBars()
+  local scrollSize = self:getTextTotalSize()
+  local scrollWidth = math.max(scrollSize.width - self:getTextVirtualSize().width, 0)
+  local scrollHeight = math.max(scrollSize.height - self:getTextVirtualSize().height, 0)
+
+  local scrollbar = self.verticalScrollBar
+  if scrollbar then
+    scrollbar:setMinimum(0)
+    scrollbar:setMaximum(scrollHeight)
+    scrollbar:setValue(self:getTextVirtualOffset().y)
+  end
+
+  local scrollbar = self.horizontalScrollBar
+  if scrollbar then
+    scrollbar:setMinimum(0)
+    scrollbar:setMaximum(scrollWidth)
+    scrollbar:setValue(self:getTextVirtualOffset().x)
+  end
+
+end
+
+-- todo: ontext change, focus to cursor