implement combobox and do some ui rework

modules/addon_playground/playground.lua

@@ -3,6 +3,8 @@
 function init()
   local box = createWidget('ComboBox')
   box:moveTo({x=100, y=8})
+  box:addOption('Option 1')
+  box:addOption('Option 2')
   displayUI(box)
 end
 

modules/core_scripts/const.lua

@@ -132,3 +132,20 @@ MouseNoButton = 0
 MouseLeftButton = 1
 MouseRightButton = 2
 MouseMidButton = 3
+
+AlignNone = 0
+AlignLeft = 1
+AlignRight = 2
+AlignTop = 4
+AlignBottom = 8
+AlignHorizontalCenter = 16
+AlignVerticalCenter = 32
+AlignTopLeft = 5
+AlignTopRight = 6
+AlignBottomLeft = 9
+AlignBottomRight = 10
+AlignLeftCenter = 33
+AlignRightCenter = 34
+AlignTopCenter = 20
+AlignBottomCenter = 24
+AlignCenter = 48

modules/core_styles/styles/checkboxes.otui

@@ -1,6 +1,7 @@
 CheckBox < UICheckBox
   size: 12 12
   box-size: 12 12
+  text-align: left
   text-offset: 16 -1
   color: #aaaaaa
   background-color: #ffffffff

modules/core_styles/styles/comboboxes.otui

@@ -2,7 +2,8 @@ ComboBox < UIComboBox
   font: verdana-11px-antialised
   color: #aaaaaa
   size: 86 20
-  text-margin: 3
+  text-offset: 3 0
+  text-align: left
   border-image:
     source: /core_styles/images/combobox.png
     border: 1

modules/core_widgets/core_widgets.otmod

@@ -7,6 +7,8 @@ Module
   onLoad: |
     require 'tooltip/tooltip'
     require 'messagebox/messagebox'
+    require 'uibutton'
+    require 'uilabel'
     require 'uicombobox'
     require 'uipopupmenu'
     return true

modules/core_widgets/tooltip/tooltip.lua

@@ -49,9 +49,9 @@ local function onWidgetHoverChange(widget, hovered)
   end
 end
 
-local function onWidgetStyleApply(widget, style)
-  if style and style.tooltip then
-    widget.tooltip = style.tooltip
+local function onWidgetStyleApply(widget, styleName, styleNode)
+  if styleNode.tooltip then
+    widget.tooltip = styleNode.tooltip
   end
 end
 

modules/core_widgets/uibutton.lua

@@ -0,0 +1,7 @@
+UIButton = extends(UIWidget)
+
+function UIButton.create()
+  local button = UIButton.internalCreate()
+  button:setFocusable(false)
+  return button
+end

modules/core_widgets/uicombobox.lua

@@ -1 +1,41 @@
 UIComboBox = extends(UIWidget)
+
+function UIComboBox.create()
+  local combobox = UIComboBox.internalCreate()
+  combobox.options = {}
+  combobox.currentIndex = -1
+  return combobox
+end
+
+function UIComboBox:setCurrentOption(text)
+  if not self.options then return end
+  for i,v in ipairs(self.options) do
+    if v.text == text and self.currentIndex ~= i then
+      self.currentIndex = i
+      self:setText(text)
+      self:onOptionChange(text, data)
+      return
+    end
+  end
+end
+
+function UIComboBox:addOption(text, data)
+  table.insert(self.options, { text = text, data = data })
+  local index = #self.options
+  if index == 1 then self:setCurrentOption(text) end
+  return index
+end
+
+function UIComboBox:onMousePress(mousePos, mouseButton)
+  local menu = createWidget('PopupMenu', self)
+  for i,v in ipairs(self.options) do
+    menu:addOption(v.text, function() self:setCurrentOption(v.text) end)
+  end
+  menu:setWidth(self:getWidth())
+  menu:display({ x = self:getX(), y = self:getY() + self:getHeight() })
+  return true
+end
+
+function UIComboBox:onOptionChange(optionText, optionData)
+  -- nothing todo
+end

modules/core_widgets/uilabel.lua

@@ -0,0 +1,9 @@
+UILabel = extends(UIWidget)
+
+function UILabel.create()
+  local label = UILabel.internalCreate()
+  label:setPhantom(true)
+  label:setFocusable(false)
+  label:setTextAlign(AlignLeft)
+  return label
+end

modules/core_widgets/uipopupmenu.lua

@@ -1,7 +1,5 @@
--- extends UIWidget
 UIPopupMenu = extends(UIWidget)
 
--- public functions
 function UIPopupMenu.create()
   local menu = UIPopupMenu.internalCreate()
   local layout = UIVerticalLayout.create(menu)
@@ -10,41 +8,39 @@ function UIPopupMenu.create()
   return menu
 end
 
-function UIPopupMenu.display(menu, pos)
-  displayUI(menu, {x = pos.x, y = pos.y})
-  menu:bindRectToParent()
-  menu:grabMouse()
-  menu:grabKeyboard()
-  return menu
+function UIPopupMenu:display(pos)
+  displayUI(self, {x = pos.x, y = pos.y})
+  self:bindRectToParent()
+  self:grabMouse()
+  self:grabKeyboard()
 end
 
-function UIPopupMenu.addOption(menu, optionName, optionCallback)
-  local optionWidget = createWidget(menu:getStyleName() .. 'Button', menu)
-  local lastOptionWidget = menu:getLastChild()
+function UIPopupMenu:addOption(optionName, optionCallback)
+  local optionWidget = createWidget(self:getStyleName() .. 'Button', self)
+  local lastOptionWidget = self:getLastChild()
   optionWidget.onClick = function()
     optionCallback()
-    menu:destroy()
+    self:destroy()
   end
   optionWidget:setText(optionName)
 end
 
-function UIPopupMenu.addSeparator(menu)
-  local separatorWidget = createWidget(menu:getStyleName() .. 'Separator', menu)
+function UIPopupMenu:addSeparator()
+  createWidget(self:getStyleName() .. 'Separator', self)
 end
 
--- hooked events
-function UIPopupMenu.onMousePress(menu, mousePos, mouseButton)
-  -- clicks outside menu area destroys the menu
-  if not menu:containsPoint(mousePos) then
-    menu:destroy()
+function UIPopupMenu:onMousePress(mousePos, mouseButton)
+  -- clicks outside self area destroys the self
+  if not self:containsPoint(mousePos) then
+    self:destroy()
     return true
   end
   return false
 end
 
-function UIPopupMenu.onKeyPress(menu, keyCode, keyText, keyboardModifiers)
+function UIPopupMenu:onKeyPress(keyCode, keyText, keyboardModifiers)
   if keyCode == KeyEscape then
-    menu:destroy()
+    self:destroy()
     return true
   end
   return false