major UIWidget rewrite with new features

TODO

@@ -16,6 +16,7 @@
 == Lua
 [bart] make possible to bind non LuaObject derived classes on lua engine (for usage with Point,Rect,Color,Size)
 [bart] bind every global lua function in static classes
+[bart] review usage of x,y/width,height in lua instead of point/size
 
 == Platform
 [bart] port to MacOs and iphone
@@ -101,4 +102,7 @@ if a spell is used while pressing arrows keys the walk is canceled and it doesnt
 game map text message boxes is not displayed like tibia
 name/shields doesnt follow the creature when walking on parcels
 hotkeys wont work with caps lock
-hotkeys works while windows are locked, it shouldnt
+hotkeys works while windows are locked, it shouldnt
+
+-- current todo
+allow usage of background width alone

modules/addon_mapeffects/mapeffects.lua

@@ -2,13 +2,15 @@ MapEffects = {}
 
 function MapEffects.init()
 --[[
-  local box = createWidget('ComboBox')
-  box:moveTo({x=100, y=8})
+  local box = createWidget('ComboBox', 'leftButtonsPanel')
+  box:addAnchor(AnchorLeft, 'prev', AnchorRight)
+  box:addAnchor(AnchorTop, 'parent', AnchorTop)
+  box:setMargin(6, 6)
   box:addOption('Normal')
   box:addOption('Bloom')
   box:addOption('TV')
   displayUI(box)
-  ]]--
+]]--
 end
 
 function MapEffects.terminate()

modules/addon_pingbar/pingbar.lua

@@ -21,7 +21,7 @@ end
 
 -- hooked events
 local function onGamePingUpdate(ping)
-  pingLabel:setText('Walk Ping: ' .. ping .. ' ms')
+  pingLabel:setText('Ping: ' .. ping .. ' ms')
 end
 
 connect(Game, { onWalkPingUpdate = onGamePingUpdate })

modules/addon_terminal/terminal.otui

@@ -2,10 +2,10 @@ TerminalLabel < UILabel
   font: terminus-14px-bold
   height: 16
 
-RectPanel
+Panel
   id: terminalPanel
   background-color: #000000
-  opacity: 216
+  opacity: 0.85
   anchors.fill: parent
   @onEscape: Terminal.hide()
 

modules/client_background/background.otui

@@ -1,9 +1,8 @@
 Panel
   id: background
-  image:
-    source: /client_background/background.png
-    smooth: true
-    fixed ratio: true
+  image-source: /client_background/background.png
+  image-smooth: true
+  image-fixed-ratio: true
   anchors.top: topMenu.bottom
   anchors.left: parent.left
   anchors.right: parent.right

modules/client_entergame/characterlist.otui

@@ -1,12 +1,8 @@
 CharacterListLabel < Label
-  image: /core_styles/images/empty_rect.png
   font: verdana-11px-monochrome
-  background-color: #00000000
+  background-color: alpha
   text-offset: 2 0
   focusable: true
-  margin-left: 1
-  margin-right: 1
-  margin-top: 1
 
   $focus:
     background-color: #ffffff22

modules/client_topmenu/topmenu.otui

@@ -1,27 +1,22 @@
 TopButton < UIButton
-  background-color: white
   size: 26 26
-  text-translate: 0 0
-  border-image:
-    source: /core_styles/images/top_button.png
-    clip: 0 0 26 26
-    border: 3
+  image-color: white
+  image-source: /core_styles/images/top_button.png
+  image-clip: 0 0 26 26
+  image-border: 3
 
   $hover:
-    border-image:
-      source: /core_styles/images/top_button.png
-      clip: 26 0 26 26
-      border: 3
+    image-source: /core_styles/images/top_button.png
+    image-clip: 26 0 26 26
+    image-border: 3
 
   $pressed:
-    text-translate: 1 1
-    border-image:
-      source: /core_styles/images/top_button.png
-      clip: 52 0 26 26
-      border: 3
+    image-source: /core_styles/images/top_button.png
+    image-clip: 52 0 26 26
+    image-border: 3
 
   $disabled:
-    background-color: #ffffff66
+    image-color: #ffffff66
 
 TopLeftButton < TopButton
   $first:

modules/core_lib/globals.lua

@@ -66,6 +66,9 @@ function createWidget(style, parent)
 
   local widget = class.create()
   if parent then
+    if type(parent) == 'string' then
+      parent = rootWidget:recursiveGetChildById(parent)
+    end
     parent:addChild(widget)
   end
   widget:setStyle(style)

modules/core_styles/core_styles.otmod

@@ -11,6 +11,7 @@ Module
     importStyle 'styles/separators.otui'
     importStyle 'styles/lineedits.otui'
     importStyle 'styles/checkboxes.otui'
+    importStyle 'styles/progressbars.otui'
     importStyle 'styles/windows.otui'
     importStyle 'styles/listboxes.otui'
     importStyle 'styles/items.otui'

modules/core_styles/styles/buttons.otui

@@ -1,26 +1,23 @@
 Button < UIButton
   font: verdana-11px-antialised
-  background-color: white
   color: #f0ad4dff
   size: 106 24
-  text-translate: 0 0
+  text-offset: 0 0
 
-  border-image:
-    source: /core_styles/images/button.png
-    border: 5
+  image-color: white
+  image-source: /core_styles/images/button.png
+  image-border: 5
 
   $hover:
-    border-image:
-      source: /core_styles/images/button_hover.png
-      border: 5
+    image-source: /core_styles/images/button_hover.png
+    image-border: 5
 
   $pressed:
-    text-translate: 1 1
-    border-image:
-      source: /core_styles/images/button_down.png
-      border: 5
+    text-offset: 1 1
+    image-source: /core_styles/images/button_down.png
+    image-border: 5
 
   $disabled:
     color: #f0ad4d88
-    background-color: #ffffff88
+    image-color: #ffffff88
 

modules/core_styles/styles/checkboxes.otui

@@ -2,41 +2,38 @@ CheckBox < UICheckBox
   size: 12 12
   box-size: 12 12
   text-align: left
-  text-offset: 16 -1
+  text-offset: 16 0
   color: #aaaaaa
-  background-color: #ffffffff
+  image-color: #ffffffff
+  image-rect: 0 0 12 12
 
   $hover:
     color: #cccccc
 
   $!checked:
-    image:
-      source: /core_styles/images/checkbox.png
-      clip: 0 0 12 12
+    image-source: /core_styles/images/checkbox.png
+    image-clip: 0 0 12 12
 
   $hover !checked:
-    image:
-      source: /core_styles/images/checkbox.png
-      clip: 0 12 12 12
+    image-source: /core_styles/images/checkbox.png
+    image-clip: 0 12 12 12
 
   $checked:
-    image:
-      source: /core_styles/images/checkbox.png
-      clip: 0 24 12 12
+    image-source: /core_styles/images/checkbox.png
+    image-clip: 0 24 12 12
 
   $hover checked:
-    image:
-      source: /core_styles/images/checkbox.png
-      clip: 0 36 12 12
+    image-source: /core_styles/images/checkbox.png
+    image-clip: 0 36 12 12
 
   $disabled:
-    background-color: #ffffff88
+    image-color: #ffffff88
     color: #aaaaaa88
 
 ColorBox < UICheckBox
   size: 16 16
   box-size: 16 16
-  background-color: #ffffffff
+  image-color: #ffffffff
 
   $checked:
     image:
@@ -50,28 +47,25 @@ ColorBox < UICheckBox
 
 ButtonBox < UICheckBox
   font: verdana-11px-antialised
-  background-color: white
   color: #f0ad4dff
   size: 106 24
   box-size: 106 24
   text-offset: 0 0
   text-align: center
 
-  border-image:
-    source: /core_styles/images/button.png
-    border: 5
+  image-color: white
+  image-source: /core_styles/images/button.png
+  image-border: 5
 
   $hover:
-    border-image:
-      source: /core_styles/images/button_hover.png
-      border: 5
+    image-source: /core_styles/images/button_hover.png
+    image-border: 5
 
   $checked:
     text-offset: 1 1
-    border-image:
-      source: /core_styles/images/button_down.png
-      border: 5
+    image-source: /core_styles/images/button_down.png
+    image-border: 5
 
   $disabled:
     color: #f0ad4d88
-    background-color: #ffffff88
+    image-color: #ffffff88

modules/core_styles/styles/comboboxes.otui

@@ -1,6 +1,6 @@
 ComboBoxPopupMenuButton < UIButton
   font: verdana-11px-antialised
-  background-color: alpha
+  image-color: alpha
   text-align: left
   text-offset: 2 0
   color: #aaaaaa
@@ -9,10 +9,7 @@ ComboBoxPopupMenuButton < UIButton
   margin-right: 1
   margin-top: 0
   margin-bottom: 0
-
-  image:
-    source: /core_styles/images/empty_rect.png
-    repeated: true
+  background-color: white
 
   $hover:
     color: #ffffff
@@ -30,19 +27,17 @@ ComboBoxPopupMenuButton < UIButton
 ComboBoxPopupMenuSeparator < UIWidget
   margin-left: 1
   margin-right: 1
-  image:
-    source: /core_styles/images/combobox.png
-    repeated: true
+  image-source: /core_styles/images/combobox.png
+  image-repeated: true
     clip: 1 59 89 1
   height: 1
   phantom: true
 
 ComboBoxPopupMenu < UIPopupMenu
-  border-image:
-    source: /core_styles/images/combobox.png
-    clip: 0 60 89 20
-    border: 1
-    border.top: 0
+  image-source: /core_styles/images/combobox.png
+  image-clip: 0 60 89 20
+  image-border: 1
+  image-border-top: 0
 
 ComboBox < UIComboBox
   font: verdana-11px-antialised
@@ -50,22 +45,19 @@ ComboBox < UIComboBox
   size: 86 20
   text-offset: 3 0
   text-align: left
-  border-image:
-    source: /core_styles/images/combobox.png
-    border: 1
-    border.right: 17
-    size: 89 20
+  image-source: /core_styles/images/combobox.png
+  image-border: 1
+  image-border-right: 17
+  image-clip: 0 0 89 20
 
   $hover:
-    border-image:
-      source: /core_styles/images/combobox.png
-      border: 1
-      border.right: 17
-      clip: 0 20 89 20
+    image-source: /core_styles/images/combobox.png
+    image-border: 1
+    image-border-right: 17
+    image-clip: 0 20 89 20
 
   $on:
-    border-image:
-      source: /core_styles/images/combobox.png
-      border: 1
-      border.right: 17
-      clip: 0 40 89 20
+    image-source: /core_styles/images/combobox.png
+    image-border: 1
+    image-border-right: 17
+    image-clip: 0 40 89 20

modules/core_styles/styles/creatures.otui

@@ -1,6 +1,5 @@
 Creature < UICreature
   size: 66 66
   padding: 1
-  border-image:
-    source: /core_styles/images/panel_flat.png
-    border: 1
+  image-source: /core_styles/images/panel_flat.png
+  image-border: 1

modules/core_styles/styles/items.otui

@@ -1,6 +1,5 @@
 Item < UIItem
   size: 34 34
   padding: 1
-  border-image:
-    source: /core_styles/images/panel_flat.png
-    border: 1
+  image-source: /core_styles/images/panel_flat.png
+  image-border: 1

modules/core_styles/styles/lineedits.otui

@@ -3,9 +3,8 @@ LineEdit < UILineEdit
   color: #aaaaaa
   size: 86 20
   text-margin: 3
-  border-image:
-    source: /core_styles/images/panel_flat.png
-    border: 1
+  image-source: /core_styles/images/panel_flat.png
+  image-border: 1
 
   $disabled:
     color: #aaaaaa88

modules/core_styles/styles/listboxes.otui

@@ -1,5 +1,5 @@
 TextList < UIWidget
   layout: verticalBox
-  border-image:
-    source: /core_styles/images/panel_flat.png
-    border: 4
+  border-width: 1
+  border-color: #1d222b
+  background-color: #222833

modules/core_styles/styles/panels.otui

@@ -1,34 +1,26 @@
 Panel < UIWidget
   phantom: true
 
-RectPanel < UIWidget
-  image: /core_styles/images/empty_rect.png
-
 FlatPanel < Panel
-  border-image:
-    source: /core_styles/images/panel_flat.png
-    border: 1
+  image-source: /core_styles/images/panel_flat.png
+  image-border: 1
 
 TopPanel < Panel
   height: 36
-  image:
-    source: /core_styles/images/top_panel.png
-    repeated: true
+  image-source: /core_styles/images/top_panel.png
+  image-repeated: true
 
 InterfacePanel < Panel
   focusable: false
-  border-image:
-    source: /core_styles/images/interface_panel.png
-    border: 4
+  image-source: /core_styles/images/interface_panel.png
+  image-border: 4
 
 InterfacePanel2 < Panel
   focusable: false
-  border-image:
-    source: /core_styles/images/interface_panel2.png
-    border: 4
+  image-source: /core_styles/images/interface_panel2.png
+  image-border: 4
 
 Map< UIMap
   padding: 4
-  border-image:
-    source: /core_styles/images/map_panel.png
-    border: 4
+  image-source: /core_styles/images/map_panel.png
+  image-border: 4

modules/core_styles/styles/popupmenus.otui

@@ -1,16 +1,13 @@
 PopupMenuButton < UIButton
   font: verdana-11px-antialised
-  background-color: alpha
+  image-color: alpha
   color: #aaaaaa
   height: 18
   margin-left: 3
   margin-right: 3
   margin-top: 0
   margin-bottom: 0
-
-  image:
-    source: /core_styles/images/empty_rect.png
-    repeated: true
+  background-color: alpha
 
   $hover:
     color: #ffffff
@@ -28,16 +25,15 @@ PopupMenuButton < UIButton
 PopupMenuSeparator < UIWidget
   margin-left: 2
   margin-right: 2
-  border-image:
-    source: /core_styles/images/menubox.png
-    border.left: 1
-    border.right: 1
-    clip: 0 0 32 2
+  image-source: /core_styles/images/menubox.png
+  image-border-left: 1
+  image-border-right: 1
+  image-clip: 0 0 32 2
   height: 2
   phantom: true
 
 PopupMenu < UIPopupMenu
   width: 50
   border-image:
-    source: /core_styles/images/menubox.png
-    border: 3
+  image-source: /core_styles/images/menubox.png
+  image-border: 3

modules/core_styles/styles/progressbars.otui

@@ -0,0 +1,4 @@
+ProgressBar < UIProgressBar
+  height: 15
+  background-color: red
+  border: 1 black

modules/core_styles/styles/separators.otui

@@ -1,7 +1,6 @@
 HorizontalSeparator < UIWidget
-  border-image:
-    source: /core_styles/images/horizontal_separator.png
-    border.top: 2
+  image-source: /core_styles/images/horizontal_separator.png
+  image-border.top: 2
   height: 2
   phantom: true
   focusable: false

modules/core_styles/styles/tabbars.otui

@@ -0,0 +1,5 @@
+TabBar < UITabBar
+TabBarTabButton < UIButton
+TabBarCloseButton < UIButton
+TabBarPrevButton < UIButton
+TabBarNextButton < UIButton

modules/core_styles/styles/windows.otui

@@ -1,20 +1,18 @@
 Window < UIWindow
   font: verdana-11px-antialised
   size: 200 200
-  opacity: 255
+  opacity: 1
   color: white
-  background-color: white
   head-height: 20
   head-text-align: center
   move-policy: free
   stackable: true
-  border-image:
-    source: /core_styles/images/window.png
-    border: 4
-    border.top: 20
+  image-source: /core_styles/images/window.png
+  image-border: 4
+  image-border-top: 20
 
   $pressed:
-    opacity: 192
+    opacity: 0.75
 
   $disabled:
     color: #aaaaaa88
@@ -28,10 +26,9 @@ MiniWindow < UIWindow
   margin-left: 6
   margin-right: 6
   move-policy: free updated
-  border-image:
-    source: /core_styles/images/mini_window.png
-    border: 4
-    border.top: 25
+  image-source: /core_styles/images/mini_window.png
+  image-border: 4
+  image-border-top: 25
 
 MainWindow < Window
   anchors.centerIn: parent

modules/core_widgets/core_widgets.otmod

@@ -5,10 +5,12 @@ Module
   website: https://github.com/edubart/otclient
 
   onLoad: |
-    require 'tooltip/tooltip'
-    require 'messagebox/messagebox'
     require 'uiwidget'
     require 'uibutton'
     require 'uilabel'
+    require 'uicheckbox'
     require 'uicombobox'
-    require 'uipopupmenu'
+    require 'uiprogressbar'
+    require 'uipopupmenu'
+    require 'tooltip/tooltip'
+    require 'messagebox/messagebox'

modules/core_widgets/tooltip/tooltip.lua

@@ -13,7 +13,7 @@ local function moveToolTip(tooltip)
   else
     pos.x = pos.x + 10
   end
-  tooltip:moveTo(pos)
+  tooltip:setPos(pos)
 end
 
 -- public functions
@@ -28,7 +28,7 @@ function ToolTip.display(text)
     local size = label:getSize()
     size.width = size.width + 4
     size.height = size.height + 4
-    currentToolTip:resize(size)
+    currentToolTip:setSize(size)
     moveToolTip(currentToolTip)
   end
 end

modules/core_widgets/tooltip/tooltip.otui

@@ -1,4 +1,4 @@
-RectPanel
+Panel
   background-color: #111111bb
   size: 200 200
   id: toolTip

modules/core_widgets/uicheckbox.lua

@@ -3,6 +3,12 @@ UICheckBox = extends(UIWidget)
 function UICheckBox.create()
   local checkbox = UICheckBox.internalCreate()
   checkbox:setFocusable(false)
-  checkbox:setAlign(AlignLeft)
+  checkbox:setTextAlign(AlignLeft)
   return checkbox
 end
+
+function UICheckBox:onMouseRelease(mousePos, mouseButton)
+  if self:isPressed() and self:containsPoint(mousePos) then
+    self:setChecked(not self:isChecked())
+  end
+end

modules/core_widgets/uiprogressbar.lua

@@ -0,0 +1,19 @@
+UIProgressBar = extends(UIWidget)
+
+function UIProgressBar.create()
+  local progressbar = UIProgressBar.internalCreate()
+  progressbar:setFocusable(false)
+  progressbar:setPhantom(true)
+  progressbar.percent = 100
+  return progressbar
+end
+
+function UIProgressBar:setPercent(percent)
+  self:setBackgroundHeight(self:getHeight())
+  self:setBackgroundWidth((percent * self:getWidth())/100)
+  self.percent = percent
+end
+
+function UIProgressBar:getPercent()
+  return self.percent
+end

modules/core_widgets/uitabbar.lua

@@ -0,0 +1 @@
+UITabBar = extends(UIWidget)

modules/core_widgets/uiwidget.lua

@@ -1,19 +1,19 @@
 function UIWidget:setMargin(...)
-    local params = {...}
-    if #params == 1 then
-        self:setMarginTop(params[1])
-        self:setMarginRight(params[1])
-        self:setMarginBottom(params[1])
-        self:setMarginLeft(params[1])
-    elseif #params == 2 then
-        self:setMarginTop(params[1])
-        self:setMarginRight(params[2])
-        self:setMarginBottom(params[1])
-        self:setMarginLeft(params[2])
-    elseif #params == 4 then
-        self:setMarginTop(params[1])
-        self:setMarginRight(params[2])
-        self:setMarginBottom(params[3])
-        self:setMarginLeft(params[4])
-    end
+  local params = {...}
+  if #params == 1 then
+    self:setMarginTop(params[1])
+    self:setMarginRight(params[1])
+    self:setMarginBottom(params[1])
+    self:setMarginLeft(params[1])
+  elseif #params == 2 then
+    self:setMarginTop(params[1])
+    self:setMarginRight(params[2])
+    self:setMarginBottom(params[1])
+    self:setMarginLeft(params[2])
+  elseif #params == 4 then
+    self:setMarginTop(params[1])
+    self:setMarginRight(params[2])
+    self:setMarginBottom(params[3])
+    self:setMarginLeft(params[4])
+  end
 end

modules/game_console/console.otui

@@ -3,6 +3,27 @@ ConsoleLabel < UILabel
   height: 14
   color: yellow
 
+SayModeButton < UIButton
+  size: 26 26
+  icon: /core_styles/icons/say.png
+  image-source: /core_styles/images/top_button.png
+  image-color: white
+  image-clip: 0 0 26 26
+  image-border: 3
+
+  $hover:
+    image-source: /core_styles/images/top_button.png
+      clip: 26 0 26 26
+      border: 3
+
+  $pressed:
+    image-source: /core_styles/images/top_button.png
+    image-clip: 52 0 26 26
+    image-border: 3
+
+  $disabled:
+    image-color: #ffffff66
+
 Panel
   id: consolePanel
   anchors.fill: parent
@@ -22,9 +43,17 @@ Panel
       align-bottom: true
     focusable: false
 
+  SayModeButton
+    id: sayModeButton
+    size: 20 20
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    margin-left: 6
+    margin-bottom: 6
+
   LineEdit
     id: consoleLineEdit
-    anchors.left: parent.left
+    anchors.left: sayModeButton.right
     anchors.right: parent.right
     anchors.bottom: parent.bottom
     margin-right: 6

modules/game_healthbar/healthbar.otui

@@ -1,15 +1,13 @@
-HealthBar < UIProgressBar
+HealthBar < ProgressBar
   id: healthBar
-  color: black
   height: 15
   background-color: red
   anchors.top: parent.top
   anchors.left: parent.left
   anchors.right: parent.right
 
-ManaBar < UIProgressBar
+ManaBar < ProgressBar
   id: manaBar
-  color: black
   height: 15
   background-color: blue
   anchors.bottom: parent.bottom

modules/game_inventory/inventory.otui

@@ -90,9 +90,8 @@ UIWindow
 
     text-align: center
 
-    border-image:
-      source: /core_styles/images/panel_flat.png
-      border: 1
+    image-source: /core_styles/images/panel_flat.png
+    image-border: 1
 
   GameLabel
     id: capacity
@@ -104,7 +103,6 @@ UIWindow
 
     text-align: center
 
-    border-image:
-      source: /core_styles/images/panel_flat.png
-      border: 1
+    image-source: /core_styles/images/panel_flat.png
+    image-border: 1
 

modules/game_skills/skills.otui

@@ -22,9 +22,8 @@ SkillValueLabel < GameLabel
   anchors.bottom: parent.bottom
   anchors.left: prev.left
 
-SkillPercentPanel < UIProgressBar
+SkillPercentPanel < ProgressBar
   id: percent
-  color: black
   background-color: green
   height: 5
   margin-top: 15
@@ -36,7 +35,7 @@ SkillPercentPanel < UIProgressBar
 MiniWindow
   id: skillWindow
   title: Skills
-  size: 200 400
+  size: 200 310
 
   Panel
     id: skillPanel
@@ -60,7 +59,7 @@ MiniWindow
         text: Level
       SkillValueLabel
       SkillPercentPanel
-        background-color: red
+        image-color: red
 
     SkillButton
       id: health
@@ -103,7 +102,7 @@ MiniWindow
         text: Magic Level
       SkillValueLabel
       SkillPercentPanel
-        background-color: red
+        image-color: red
 
     SkillButton
       id: skillId0

modules/game_viplist/viplist.otui

@@ -8,11 +8,11 @@ MiniWindow
   id: vipWindow
   title: VIP List
 
-  TextList
+  UIWidget
     id: vipList
-    border-image: ~
+    layout: verticalBox
     anchors.fill: parent
-    margin-top: 26
+    margin-top: 27
     margin-bottom: 6
     margin-left: 6
     margin-right: 6

src/framework/CMakeLists.txt

@@ -159,8 +159,6 @@ SET(framework_SOURCES ${framework_SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/graphics/framebuffer.cpp
     ${CMAKE_CURRENT_LIST_DIR}/graphics/animatedtexture.cpp
     ${CMAKE_CURRENT_LIST_DIR}/graphics/texturemanager.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/graphics/borderimage.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/graphics/image.cpp
     ${CMAKE_CURRENT_LIST_DIR}/graphics/particlemanager.cpp
     ${CMAKE_CURRENT_LIST_DIR}/graphics/particlesystem.cpp
     ${CMAKE_CURRENT_LIST_DIR}/graphics/particleemitter.cpp
@@ -187,13 +185,14 @@ SET(framework_SOURCES ${framework_SOURCES}
     # framework ui
     ${CMAKE_CURRENT_LIST_DIR}/ui/uimanager.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uiwidget.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/uiwidgetimage.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/uiwidgettext.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/uiwidgetbasestyle.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uilineedit.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uiwindow.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uianchorlayout.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uiverticallayout.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uilayout.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/ui/uiprogressbar.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/ui/uicheckbox.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uiframecounter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ui/uitranslator.cpp
 

src/framework/graphics/borderimage.cpp

@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "borderimage.h"
-#include "graphics.h"
-#include "texture.h"
-#include "texturemanager.h"
-
-#include <framework/otml/otml.h>
-
-BorderImage::BorderImage(TexturePtr texture,
-                             const Rect& left,
-                             const Rect& right,
-                             const Rect& top,
-                             const Rect& bottom,
-                             const Rect& topLeft,
-                             const Rect& topRight,
-                             const Rect& bottomLeft,
-                             const Rect& bottomRight,
-                             const Rect& center)
-{
-    m_texture = texture;
-    m_leftBorderTexCoords = left;
-    m_rightBorderTexCoords = right;
-    m_topBorderTexCoords = top;
-    m_bottomBorderTexCoords = bottom;
-    m_topLeftCornerTexCoords = topLeft;
-    m_topRightCornerTexCoords = topRight;
-    m_bottomLeftCornerTexCoords = bottomLeft;
-    m_bottomRightCornerTexCoords = bottomRight;
-    m_centerTexCoords = center;
-
-    m_bordersSize = Size(left.width() + right.width(),
-                         top.height() + bottom.height());
-
-    m_defaultSize = Size(std::max(std::max(topLeft.width(), bottomLeft.width()), left.width()) +
-                            std::max(std::max(topRight.width(), bottomRight.width()), right.width()) +
-                            center.width(),
-                         std::max(std::max(topLeft.height(), topRight.height()), top.height()) +
-                            std::max(std::max(bottomLeft.height(), bottomRight.height()), bottom.height()) +
-                            center.height());
-}
-
-BorderImagePtr BorderImage::loadFromOTML(const OTMLNodePtr& borderImageNode)
-{
-    Rect leftBorder;
-    Rect rightBorder;
-    Rect topBorder;
-    Rect bottomBorder;
-    Rect topLeftCorner;
-    Rect topRightCorner;
-    Rect bottomLeftCorner;
-    Rect bottomRightCorner;
-    Rect center;
-    Rect clipRect;
-    int top, bottom, left, right, border;
-    Size size;
-    Point offset;
-
-    // load texture
-    std::string source = borderImageNode->at("source")->value();
-    TexturePtr texture = g_textures.getTexture(source);
-
-    // load basic border confs
-    border = borderImageNode->valueAt("border", 0);
-    clipRect = borderImageNode->valueAt("clip", Rect(0, 0, texture->getSize()));
-
-    // load border margins
-    top = bottom = left = right = border;
-    top = borderImageNode->valueAt("border.top", top);
-    bottom = borderImageNode->valueAt("border.bottom", bottom);
-    left = borderImageNode->valueAt("border.left", left);
-    right = borderImageNode->valueAt("border.right", right);
-
-    // calculates border coords
-    leftBorder = Rect(clipRect.left(), clipRect.top() + top, left, clipRect.height() - top - bottom);
-    rightBorder = Rect(clipRect.right() - right + 1, clipRect.top() + top, right, clipRect.height() - top - bottom);
-    topBorder = Rect(clipRect.left() + left, clipRect.top(), clipRect.width() - right - left, top);
-    bottomBorder = Rect(clipRect.left() + left, clipRect.bottom() - bottom + 1, clipRect.width() - right - left, bottom);
-    topLeftCorner = Rect(clipRect.left(), clipRect.top(), left, top);
-    topRightCorner = Rect(clipRect.right() - right + 1, clipRect.top(), right, top);
-    bottomLeftCorner = Rect(clipRect.left(), clipRect.bottom() - bottom + 1, left, bottom);
-    bottomRightCorner = Rect(clipRect.right() - right + 1, clipRect.bottom() - bottom + 1, right, bottom);
-    center = Rect(clipRect.left() + left, clipRect.top() + top, clipRect.width() - right - left, clipRect.height() - top - bottom);
-
-    // load individual border conf if supplied
-    /*
-    leftBorder = borderImageNode->valueAt("left border", leftBorder);
-    rightBorder = borderImageNode->valueAt("right border", rightBorder);
-    topBorder = borderImageNode->valueAt("top border", topBorder);
-    bottomBorder = borderImageNode->valueAt("bottom border", bottomBorder);
-    topLeftCorner = borderImageNode->valueAt("top left corner", topLeftCorner);
-    topRightCorner = borderImageNode->valueAt("top right corner", topRightCorner);
-    bottomLeftCorner = borderImageNode->valueAt("bottom left corner", bottomLeftCorner);
-    bottomRightCorner = borderImageNode->valueAt("bottom right corner", bottomRightCorner);
-    center = borderImageNode->valueAt("center", center);
-    */
-
-    return BorderImagePtr(new BorderImage(texture,
-                            leftBorder,
-                            rightBorder,
-                            topBorder,
-                            bottomBorder,
-                            topLeftCorner,
-                            topRightCorner,
-                            bottomLeftCorner,
-                            bottomRightCorner,
-                            center));
-}
-
-void BorderImage::draw(const Rect& screenCoords)
-{
-    //TODO: borderimage drawing could be optimized by caching the render into a texture
-    if(screenCoords != m_cachedScreenCoords) {
-        m_cachedScreenCoords = screenCoords;
-        m_coordsBuffer.clear();
-
-        Rect rectCoords;
-        Size centerSize = screenCoords.size() - m_bordersSize;
-
-        // first the center
-        if(centerSize.area() > 0) {
-            rectCoords = Rect(screenCoords.left() + m_leftBorderTexCoords.width(),
-                            screenCoords.top() + m_topBorderTexCoords.height(),
-                            centerSize);
-            m_coordsBuffer.addRepeatedRects(rectCoords, m_centerTexCoords);
-        }
-
-        // top left corner
-        rectCoords = Rect(screenCoords.topLeft(),
-                        m_topLeftCornerTexCoords.size());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_topLeftCornerTexCoords);
-
-        // top
-        rectCoords = Rect(screenCoords.left() + m_topLeftCornerTexCoords.width(),
-                        screenCoords.topLeft().y,
-                        centerSize.width(),
-                        m_topBorderTexCoords.height());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_topBorderTexCoords);
-
-
-        // top right corner
-        rectCoords = Rect(screenCoords.left() + m_topLeftCornerTexCoords.width() + centerSize.width(),
-                        screenCoords.top(),
-                        m_topRightCornerTexCoords.size());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_topRightCornerTexCoords);
-
-        // left
-        rectCoords = Rect(screenCoords.left(),
-                        screenCoords.top() + m_topLeftCornerTexCoords.height(),
-                        m_leftBorderTexCoords.width(),
-                        centerSize.height());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_leftBorderTexCoords);
-
-        // right
-        rectCoords = Rect(screenCoords.left() + m_leftBorderTexCoords.width() + centerSize.width(),
-                        screenCoords.top() + m_topRightCornerTexCoords.height(),
-                        m_rightBorderTexCoords.width(),
-                        centerSize.height());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_rightBorderTexCoords);
-
-        // bottom left corner
-        rectCoords = Rect(screenCoords.left(),
-                        screenCoords.top() + m_topLeftCornerTexCoords.height() + centerSize.height(),
-                        m_bottomLeftCornerTexCoords.size());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_bottomLeftCornerTexCoords);
-
-        // bottom
-        rectCoords = Rect(screenCoords.left() + m_bottomLeftCornerTexCoords.width(),
-                        screenCoords.top() + m_topBorderTexCoords.height() + centerSize.height(),
-                        centerSize.width(),
-                        m_bottomBorderTexCoords.height());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_bottomBorderTexCoords);
-
-        // bottom right corner
-        rectCoords = Rect(screenCoords.left() + m_bottomLeftCornerTexCoords.width() + centerSize.width(),
-                        screenCoords.top() + m_topRightCornerTexCoords.height() + centerSize.height(),
-                        m_bottomRightCornerTexCoords.size());
-        m_coordsBuffer.addRepeatedRects(rectCoords, m_bottomRightCornerTexCoords);
-    }
-    g_painter.drawTextureCoords(m_coordsBuffer, m_texture);
-}

src/framework/graphics/borderimage.h

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef BORDERIMAGE_H
-#define BORDERIMAGE_H
-
-#include "image.h"
-
-class BorderImage : public Image
-{
-public:
-    BorderImage(TexturePtr texture,
-                  const Rect& left,
-                  const Rect& right,
-                  const Rect& top,
-                  const Rect& bottom,
-                  const Rect& topLeft,
-                  const Rect& topRight,
-                  const Rect& bottomLeft,
-                  const Rect& bottomRight,
-                  const Rect& center);
-
-    static BorderImagePtr loadFromOTML(const OTMLNodePtr& borderImageNode);
-
-    void draw(const Rect& screenCoords);
-
-    Size getDefaultSize() const { return m_defaultSize; }
-
-private:
-    Rect m_leftBorderTexCoords;
-    Rect m_rightBorderTexCoords;
-    Rect m_topBorderTexCoords;
-    Rect m_bottomBorderTexCoords;
-
-    Rect m_topLeftCornerTexCoords;
-    Rect m_topRightCornerTexCoords;
-    Rect m_bottomLeftCornerTexCoords;
-    Rect m_bottomRightCornerTexCoords;
-
-    Rect m_centerTexCoords;
-
-    Size m_bordersSize;
-    Size m_defaultSize;
-};
-
-#endif

src/framework/graphics/declarations.h

@@ -29,8 +29,6 @@
 class Texture;
 class AnimatedTexture;
 class Font;
-class Image;
-class BorderImage;
 class FrameBuffer;
 class Shader;
 class ShaderProgram;
@@ -46,8 +44,6 @@ typedef std::weak_ptr<ParticleSystem> ParticleSystemWeakPtr;
 typedef std::shared_ptr<Texture> TexturePtr;
 typedef std::shared_ptr<AnimatedTexture> AnimatedTexturePtr;
 typedef std::shared_ptr<Font> FontPtr;
-typedef std::shared_ptr<Image> ImagePtr;
-typedef std::shared_ptr<BorderImage> BorderImagePtr;
 typedef std::shared_ptr<FrameBuffer> FrameBufferPtr;
 typedef std::shared_ptr<Shader> ShaderPtr;
 typedef std::shared_ptr<ShaderProgram> ShaderProgramPtr;

src/framework/graphics/framebuffer.cpp

@@ -44,7 +44,7 @@ void FrameBuffer::resize(const Size& size)
 {
     internalBind();
     m_texture = TexturePtr(new Texture(size.width(), size.height(), 4));
-    m_texture->enableBilinearFilter();
+    m_texture->setSmooth(true);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture->getId(), 0);
 
     GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);

src/framework/graphics/image.cpp

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "image.h"
-#include "texture.h"
-#include "graphics.h"
-#include "texturemanager.h"
-
-#include <framework/otml/otml.h>
-
-Image::Image()
-{
-    m_fixedRatio = false;
-    m_repeated = false;
-}
-
-void Image::loadFromOTML(const OTMLNodePtr& imageNode)
-{
-    // load configs from otml node
-    std::string source = imageNode->hasValue() ? imageNode->value() : imageNode->valueAt("source");
-    bool smooth = imageNode->valueAt("smooth", false);
-    m_fixedRatio = imageNode->valueAt("fixed ratio", false);
-    m_repeated = imageNode->valueAt("repeated", false);
-
-    // load texture
-    m_texture = g_textures.getTexture(source);
-    m_textureCoords = imageNode->valueAt("clip", Rect(0, 0, m_texture->getSize()));
-
-    // enable texture bilinear filter
-    if(smooth)
-        m_texture->enableBilinearFilter();
-}
-
-void Image::draw(const Rect& screenCoords)
-{
-    if(!m_texture)
-        return;
-
-    if(m_cachedScreenCoords != screenCoords) {
-        m_cachedScreenCoords = screenCoords;
-        m_coordsBuffer.clear();
-
-        if(m_fixedRatio) {
-            const Size& texSize = m_texture->getSize();
-            Size texCoordsSize = screenCoords.size();
-            texCoordsSize.scale(texSize, Fw::KeepAspectRatio);
-            Point texCoordsOffset;
-            if(texSize.height() > texCoordsSize.height())
-                texCoordsOffset.y = (texSize.height() - texCoordsSize.height())/2;
-            else if(texSize.width() > texCoordsSize.width())
-                texCoordsOffset.x = (texSize.width() - texCoordsSize.width())/2;
-
-            m_coordsBuffer.addRect(screenCoords, Rect(texCoordsOffset, texCoordsSize));
-        } else {
-            if(m_repeated)
-                m_coordsBuffer.addRepeatedRects(screenCoords, m_textureCoords);
-            else
-                m_coordsBuffer.addRect(screenCoords, m_textureCoords);
-        }
-    }
-
-    g_painter.drawTextureCoords(m_coordsBuffer, m_texture);
-}

src/framework/graphics/image.h

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef IMAGE_H
-#define IMAGE_H
-
-#include "declarations.h"
-#include "coordsbuffer.h"
-
-#include <framework/otml/declarations.h>
-
-class Image
-{
-public:
-    Image();
-
-    void loadFromOTML(const OTMLNodePtr& imageNode);
-
-    virtual void draw(const Rect& screenCoords);
-
-protected:
-    TexturePtr m_texture;
-    Rect m_textureCoords;
-    bool m_fixedRatio;
-    bool m_repeated;
-
-    Rect m_cachedScreenCoords;
-    CoordsBuffer m_coordsBuffer;
-};
-
-#endif

src/framework/graphics/painter.h

@@ -51,13 +51,13 @@ public:
     void setColor(const Color& color) { m_currentColor = color; }
     Color getColor() { return m_currentColor; }
 
-    void setOpacity(int opacity) { m_currentOpacity = opacity / 255.0f; }
-    int getOpacity() { return m_currentOpacity * 255.0f; }
+    void setOpacity(float opacity) { m_currentOpacity = opacity; }
+    float getOpacity() { return m_currentOpacity; }
 
     void setCustomProgram(PainterShaderProgramPtr program);
     void releaseCustomProgram() { m_customProgram = nullptr; }
     void setCompositionMode(CompositionMode compositionMode);
-    
+
     void setProjectionMatrix(const Matrix3& projectionMatrix) { m_projectionMatrix = projectionMatrix; }
     Matrix3 getProjectionMatrix() { return m_projectionMatrix; }
 

src/framework/graphics/particle.cpp

@@ -91,7 +91,7 @@ void Particle::updatePosition(double elapsedTime)
         m_velocity += m_acceleration * elapsedTime;
     }
 
-    m_rect.moveTo((int)m_position.x - m_size.width() / 2, (int)m_position.y - m_size.height() / 2);
+    m_rect.move((int)m_position.x - m_size.width() / 2, (int)m_position.y - m_size.height() / 2);
 }
 
 void Particle::updateSize()

src/framework/graphics/texture.cpp

@@ -95,12 +95,23 @@ uint Texture::internalLoadGLTexture(uchar *pixels, int channels, int width, int
     return id;
 }
 
-void Texture::enableBilinearFilter()
+void Texture::setSmooth(bool smooth)
 {
-    // enable smooth texture
-    glBindTexture(GL_TEXTURE_2D, m_textureId);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    if(smooth == m_smooth)
+        return;
+
+    if(smooth) {
+        // enable smooth texture
+        glBindTexture(GL_TEXTURE_2D, m_textureId);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    } else {
+        // nearest filtering (non smooth)
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    }
+
+    m_smooth = true;
 }
 
 std::vector<uint8> Texture::getPixels()

src/framework/graphics/texture.h

@@ -32,7 +32,7 @@ public:
     Texture(int width, int height, int channels, uchar* pixels = NULL);
     virtual ~Texture();
 
-    virtual void enableBilinearFilter();
+    virtual void setSmooth(bool smooth);
     GLuint getId()  { return m_textureId; }
 
     std::vector<uint8> getPixels();
@@ -48,6 +48,7 @@ protected:
 
     GLuint m_textureId;
     Size m_size;
+    Boolean<false> m_smooth;
 };
 
 #endif

src/framework/luafunctions.cpp

@@ -45,55 +45,70 @@ void Application::registerLuaFunctions()
 
     // UIWidget
     g_lua.registerClass<UIWidget>();
-    g_lua.bindClassStaticFunction<UIWidget>("create", []{ return UIWidgetPtr(new UIWidget); } );
+    g_lua.bindClassStaticFunction<UIWidget>("create", []{ return UIWidgetPtr(new UIWidget); });
+    g_lua.bindClassMemberFunction<UIWidget>("addChild", &UIWidget::addChild);
+    g_lua.bindClassMemberFunction<UIWidget>("insertChild", &UIWidget::insertChild);
+    g_lua.bindClassMemberFunction<UIWidget>("removeChild", &UIWidget::removeChild);
+    g_lua.bindClassMemberFunction<UIWidget>("focusChild", &UIWidget::focusChild);
+    g_lua.bindClassMemberFunction<UIWidget>("focusNextChild", &UIWidget::focusNextChild);
+    g_lua.bindClassMemberFunction<UIWidget>("focusPreviousChild", &UIWidget::focusPreviousChild);
+    g_lua.bindClassMemberFunction<UIWidget>("moveChildToTop", &UIWidget::moveChildToTop);
+    g_lua.bindClassMemberFunction<UIWidget>("moveChildToIndex", &UIWidget::moveChildToIndex);
+    g_lua.bindClassMemberFunction<UIWidget>("lockChild", &UIWidget::lockChild);
+    g_lua.bindClassMemberFunction<UIWidget>("unlockChild", &UIWidget::unlockChild);
+    g_lua.bindClassMemberFunction<UIWidget>("applyStyle", &UIWidget::applyStyle);
+    g_lua.bindClassMemberFunction<UIWidget>("addAnchor", &UIWidget::addAnchor);
+    g_lua.bindClassMemberFunction<UIWidget>("fill", &UIWidget::fill);
+    g_lua.bindClassMemberFunction<UIWidget>("centerIn", &UIWidget::centerIn);
+    g_lua.bindClassMemberFunction<UIWidget>("breakAnchors", &UIWidget::breakAnchors);
+    g_lua.bindClassMemberFunction<UIWidget>("updateParentLayout", &UIWidget::updateParentLayout);
+    g_lua.bindClassMemberFunction<UIWidget>("updateLayout", &UIWidget::updateLayout);
+    g_lua.bindClassMemberFunction<UIWidget>("lock", &UIWidget::lock);
+    g_lua.bindClassMemberFunction<UIWidget>("unlock", &UIWidget::unlock);
+    g_lua.bindClassMemberFunction<UIWidget>("focus", &UIWidget::focus);
+    g_lua.bindClassMemberFunction<UIWidget>("grabMouse", &UIWidget::grabMouse);
+    g_lua.bindClassMemberFunction<UIWidget>("ungrabMouse", &UIWidget::ungrabMouse);
+    g_lua.bindClassMemberFunction<UIWidget>("grabKeyboard", &UIWidget::grabKeyboard);
+    g_lua.bindClassMemberFunction<UIWidget>("ungrabKeyboard", &UIWidget::ungrabKeyboard);
+    g_lua.bindClassMemberFunction<UIWidget>("bindRectToParent", &UIWidget::bindRectToParent);
     g_lua.bindClassMemberFunction<UIWidget>("destroy", &UIWidget::destroy);
-    g_lua.bindClassMemberFunction<UIWidget>("setVisible", &UIWidget::setVisible);
+    g_lua.bindClassMemberFunction<UIWidget>("setId", &UIWidget::setId);
+    g_lua.bindClassMemberFunction<UIWidget>("setParent", &UIWidget::setParent);
+    g_lua.bindClassMemberFunction<UIWidget>("setLayout", &UIWidget::setLayout);
+    g_lua.bindClassMemberFunction<UIWidget>("setRect", &UIWidget::setRect);
+    g_lua.bindClassMemberFunction<UIWidget>("setStyle", &UIWidget::setStyle);
+    g_lua.bindClassMemberFunction<UIWidget>("setStyleFromNode", &UIWidget::setStyleFromNode);
     g_lua.bindClassMemberFunction<UIWidget>("setEnabled", &UIWidget::setEnabled);
-    g_lua.bindClassMemberFunction<UIWidget>("setChecked", &UICheckBox::setChecked);
-    g_lua.bindClassMemberFunction<UIWidget>("setOn", &UICheckBox::setOn);
+    g_lua.bindClassMemberFunction<UIWidget>("setVisible", &UIWidget::setVisible);
     g_lua.bindClassMemberFunction<UIWidget>("setPressed", &UIWidget::setPressed);
-    g_lua.bindClassMemberFunction<UIWidget>("setId", &UIWidget::setId);
+    g_lua.bindClassMemberFunction<UIWidget>("setOn", &UIWidget::setOn);
+    g_lua.bindClassMemberFunction<UIWidget>("setChecked", &UIWidget::setChecked);
     g_lua.bindClassMemberFunction<UIWidget>("setFocusable", &UIWidget::setFocusable);
     g_lua.bindClassMemberFunction<UIWidget>("setPhantom", &UIWidget::setPhantom);
-    g_lua.bindClassMemberFunction<UIWidget>("setStyle", &UIWidget::setStyle);
-    g_lua.bindClassMemberFunction<UIWidget>("setStyleFromNode", &UIWidget::setStyleFromNode);
-    g_lua.bindClassMemberFunction<UIWidget>("setLayout", &UIWidget::setLayout);
-    g_lua.bindClassMemberFunction<UIWidget>("setParent", &UIWidget::setParent);
-    g_lua.bindClassMemberFunction<UIWidget>("setRect", &UIWidget::setRect);
-    g_lua.bindClassMemberFunction<UIWidget>("setX", &UIWidget::setX);
-    g_lua.bindClassMemberFunction<UIWidget>("setY", &UIWidget::setY);
-    g_lua.bindClassMemberFunction<UIWidget>("setWidth", &UIWidget::setWidth);
-    g_lua.bindClassMemberFunction<UIWidget>("setHeight", &UIWidget::setHeight);
-    g_lua.bindClassMemberFunction<UIWidget>("setIcon", &UIWidget::setIcon);
-    g_lua.bindClassMemberFunction<UIWidget>("setOpacity", &UIWidget::setOpacity);
-    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundColor", &UIWidget::setBackgroundColor);
-    g_lua.bindClassMemberFunction<UIWidget>("setColor", &UIWidget::setColor);
-    g_lua.bindClassMemberFunction<UIWidget>("setMarginTop", &UIWidget::setMarginTop);
-    g_lua.bindClassMemberFunction<UIWidget>("setMarginRight", &UIWidget::setMarginRight);
-    g_lua.bindClassMemberFunction<UIWidget>("setMarginBottom", &UIWidget::setMarginBottom);
-    g_lua.bindClassMemberFunction<UIWidget>("setMarginLeft", &UIWidget::setMarginLeft);
-    g_lua.bindClassMemberFunction<UIWidget>("setText", &UIWidget::setText);
-    g_lua.bindClassMemberFunction<UIWidget>("setTextAlign", &UIWidget::setTextAlign);
-    g_lua.bindClassMemberFunction<UIWidget>("setTextOffset", &UIWidget::setTextOffset);
-    g_lua.bindClassMemberFunction<UIWidget>("setFont", &UIWidget::setFont);
-    g_lua.bindClassMemberFunction<UIWidget>("setSizeFixed", &UIWidget::setSizeFixed);
+    g_lua.bindClassMemberFunction<UIWidget>("setFixedSize", &UIWidget::setFixedSize);
     g_lua.bindClassMemberFunction<UIWidget>("setLastFocusReason", &UIWidget::setLastFocusReason);
-    g_lua.bindClassMemberFunction<UIWidget>("bindRectToParent", &UIWidget::bindRectToParent);
+    g_lua.bindClassMemberFunction<UIWidget>("isVisible", &UIWidget::isVisible);
+    g_lua.bindClassMemberFunction<UIWidget>("isChildLocked", &UIWidget::isChildLocked);
+    g_lua.bindClassMemberFunction<UIWidget>("hasChild", &UIWidget::hasChild);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildIndex", &UIWidget::getChildIndex);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildrenRect", &UIWidget::getChildrenRect);
+    g_lua.bindClassMemberFunction<UIWidget>("getAnchoredLayout", &UIWidget::getAnchoredLayout);
+    g_lua.bindClassMemberFunction<UIWidget>("getRootParent", &UIWidget::getRootParent);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildAfter", &UIWidget::getChildAfter);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildBefore", &UIWidget::getChildBefore);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildById", &UIWidget::getChildById);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildByPos", &UIWidget::getChildByPos);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildByIndex", &UIWidget::getChildByIndex);
+    g_lua.bindClassMemberFunction<UIWidget>("recursiveGetChildById", &UIWidget::recursiveGetChildById);
+    g_lua.bindClassMemberFunction<UIWidget>("recursiveGetChildByPos", &UIWidget::recursiveGetChildByPos);
+    g_lua.bindClassMemberFunction<UIWidget>("backwardsGetWidgetById", &UIWidget::backwardsGetWidgetById);
+    g_lua.bindClassMemberFunction<UIWidget>("asUIWidget", &UIWidget::asUIWidget);
     g_lua.bindClassMemberFunction<UIWidget>("resize", &UIWidget::resize);
-    g_lua.bindClassMemberFunction<UIWidget>("resizeToText", &UIWidget::resizeToText);
-    g_lua.bindClassMemberFunction<UIWidget>("moveTo", &UIWidget::moveTo);
+    g_lua.bindClassMemberFunction<UIWidget>("move", &UIWidget::move);
     g_lua.bindClassMemberFunction<UIWidget>("hide", &UIWidget::hide);
     g_lua.bindClassMemberFunction<UIWidget>("show", &UIWidget::show);
     g_lua.bindClassMemberFunction<UIWidget>("disable", &UIWidget::disable);
     g_lua.bindClassMemberFunction<UIWidget>("enable", &UIWidget::enable);
-    g_lua.bindClassMemberFunction<UIWidget>("lock", &UIWidget::lock);
-    g_lua.bindClassMemberFunction<UIWidget>("unlock", &UIWidget::unlock);
-    g_lua.bindClassMemberFunction<UIWidget>("focus", &UIWidget::focus);
-    g_lua.bindClassMemberFunction<UIWidget>("grabMouse", &UIWidget::grabMouse);
-    g_lua.bindClassMemberFunction<UIWidget>("ungrabMouse", &UIWidget::ungrabMouse);
-    g_lua.bindClassMemberFunction<UIWidget>("grabKeyboard", &UIWidget::grabKeyboard);
-    g_lua.bindClassMemberFunction<UIWidget>("ungrabKeyboard", &UIWidget::ungrabKeyboard);
-    g_lua.bindClassMemberFunction<UIWidget>("clearText", &UIWidget::clearText);
     g_lua.bindClassMemberFunction<UIWidget>("isActive", &UIWidget::isActive);
     g_lua.bindClassMemberFunction<UIWidget>("isEnabled", &UIWidget::isEnabled);
     g_lua.bindClassMemberFunction<UIWidget>("isDisabled", &UIWidget::isDisabled);
@@ -104,72 +119,154 @@ void Application::registerLuaFunctions()
     g_lua.bindClassMemberFunction<UIWidget>("isMiddle", &UIWidget::isMiddle);
     g_lua.bindClassMemberFunction<UIWidget>("isLast", &UIWidget::isLast);
     g_lua.bindClassMemberFunction<UIWidget>("isAlternate", &UIWidget::isAlternate);
-    g_lua.bindClassMemberFunction<UIWidget>("isVisible", &UIWidget::isVisible);
-    g_lua.bindClassMemberFunction<UIWidget>("isOn", &UICheckBox::isOn);
-    g_lua.bindClassMemberFunction<UIWidget>("isChecked", &UICheckBox::isChecked);
+    g_lua.bindClassMemberFunction<UIWidget>("isChecked", &UIWidget::isChecked);
+    g_lua.bindClassMemberFunction<UIWidget>("isOn", &UIWidget::isOn);
     g_lua.bindClassMemberFunction<UIWidget>("isHidden", &UIWidget::isHidden);
     g_lua.bindClassMemberFunction<UIWidget>("isExplicitlyEnabled", &UIWidget::isExplicitlyEnabled);
     g_lua.bindClassMemberFunction<UIWidget>("isExplicitlyVisible", &UIWidget::isExplicitlyVisible);
     g_lua.bindClassMemberFunction<UIWidget>("isFocusable", &UIWidget::isFocusable);
     g_lua.bindClassMemberFunction<UIWidget>("isPhantom", &UIWidget::isPhantom);
-    g_lua.bindClassMemberFunction<UIWidget>("isSizeFixed", &UIWidget::isSizeFixed);
-    g_lua.bindClassMemberFunction<UIWidget>("containsPoint", &UIWidget::containsPoint);
+    g_lua.bindClassMemberFunction<UIWidget>("isFixedSize", &UIWidget::isFixedSize);
+    g_lua.bindClassMemberFunction<UIWidget>("isDestroyed", &UIWidget::isDestroyed);
     g_lua.bindClassMemberFunction<UIWidget>("hasChildren", &UIWidget::hasChildren);
-    g_lua.bindClassMemberFunction<UIWidget>("hasChild", &UIWidget::hasChild);
+    g_lua.bindClassMemberFunction<UIWidget>("containsPoint", &UIWidget::containsPoint);
     g_lua.bindClassMemberFunction<UIWidget>("getId", &UIWidget::getId);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildCount", &UIWidget::getChildCount);
-    g_lua.bindClassMemberFunction<UIWidget>("getLayout", &UIWidget::getLayout);
     g_lua.bindClassMemberFunction<UIWidget>("getParent", &UIWidget::getParent);
-    g_lua.bindClassMemberFunction<UIWidget>("getRootParent", &UIWidget::getRootParent);
-    g_lua.bindClassMemberFunction<UIWidget>("getPos", &UIWidget::getPos);
-    g_lua.bindClassMemberFunction<UIWidget>("getSize", &UIWidget::getSize);
-    g_lua.bindClassMemberFunction<UIWidget>("getRect", &UIWidget::getRect);
+    g_lua.bindClassMemberFunction<UIWidget>("getFocusedChild", &UIWidget::getFocusedChild);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildren", &UIWidget::getChildren);
+    g_lua.bindClassMemberFunction<UIWidget>("getFirstChild", &UIWidget::getFirstChild);
+    g_lua.bindClassMemberFunction<UIWidget>("getLastChild", &UIWidget::getLastChild);
+    g_lua.bindClassMemberFunction<UIWidget>("getLayout", &UIWidget::getLayout);
+    g_lua.bindClassMemberFunction<UIWidget>("getStyle", &UIWidget::getStyle);
+    g_lua.bindClassMemberFunction<UIWidget>("getChildCount", &UIWidget::getChildCount);
+    g_lua.bindClassMemberFunction<UIWidget>("getLastFocusReason", &UIWidget::getLastFocusReason);
+    g_lua.bindClassMemberFunction<UIWidget>("getStyleName", &UIWidget::getStyleName);
+    g_lua.bindClassMemberFunction<UIWidget>("setX", &UIWidget::setX);
+    g_lua.bindClassMemberFunction<UIWidget>("setY", &UIWidget::setY);
+    g_lua.bindClassMemberFunction<UIWidget>("setWidth", &UIWidget::setWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("setHeight", &UIWidget::setHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("setSize", &UIWidget::setSize);
+    g_lua.bindClassMemberFunction<UIWidget>("setPos", &UIWidget::setPos);
+    g_lua.bindClassMemberFunction<UIWidget>("setColor", &UIWidget::setColor);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundColor", &UIWidget::setBackgroundColor);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundOffsetX", &UIWidget::setBackgroundOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundOffsetY", &UIWidget::setBackgroundOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundOffset", &UIWidget::setBackgroundOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundWidth", &UIWidget::setBackgroundWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundHeight", &UIWidget::setBackgroundHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundSize", &UIWidget::setBackgroundSize);
+    g_lua.bindClassMemberFunction<UIWidget>("setBackgroundRect", &UIWidget::setBackgroundRect);
+    g_lua.bindClassMemberFunction<UIWidget>("setIcon", &UIWidget::setIcon);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconColor", &UIWidget::setIconColor);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconOffsetX", &UIWidget::setIconOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconOffsetY", &UIWidget::setIconOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconOffset", &UIWidget::setIconOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconWidth", &UIWidget::setIconWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconHeight", &UIWidget::setIconHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconSize", &UIWidget::setIconSize);
+    g_lua.bindClassMemberFunction<UIWidget>("setIconRect", &UIWidget::setIconRect);
+    g_lua.bindClassMemberFunction<UIWidget>("setBorderWidth", &UIWidget::setBorderWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("setBorderColor", &UIWidget::setBorderColor);
+    g_lua.bindClassMemberFunction<UIWidget>("setMargin", &UIWidget::setMargin);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginHorizontal", &UIWidget::setMarginHorizontal);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginVertical", &UIWidget::setMarginVertical);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginTop", &UIWidget::setMarginTop);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginRight", &UIWidget::setMarginRight);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginBottom", &UIWidget::setMarginBottom);
+    g_lua.bindClassMemberFunction<UIWidget>("setMarginLeft", &UIWidget::setMarginLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("setPadding", &UIWidget::setPadding);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingHorizontal", &UIWidget::setPaddingHorizontal);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingVertical", &UIWidget::setPaddingVertical);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingTop", &UIWidget::setPaddingTop);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingRight", &UIWidget::setPaddingRight);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingBottom", &UIWidget::setPaddingBottom);
+    g_lua.bindClassMemberFunction<UIWidget>("setPaddingLeft", &UIWidget::setPaddingLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("setOpacity", &UIWidget::setOpacity);
     g_lua.bindClassMemberFunction<UIWidget>("getX", &UIWidget::getX);
     g_lua.bindClassMemberFunction<UIWidget>("getY", &UIWidget::getY);
+    g_lua.bindClassMemberFunction<UIWidget>("getPos", &UIWidget::getPos);
     g_lua.bindClassMemberFunction<UIWidget>("getWidth", &UIWidget::getWidth);
     g_lua.bindClassMemberFunction<UIWidget>("getHeight", &UIWidget::getHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("getSize", &UIWidget::getSize);
+    g_lua.bindClassMemberFunction<UIWidget>("getRect", &UIWidget::getRect);
     g_lua.bindClassMemberFunction<UIWidget>("getColor", &UIWidget::getColor);
     g_lua.bindClassMemberFunction<UIWidget>("getBackgroundColor", &UIWidget::getBackgroundColor);
-    g_lua.bindClassMemberFunction<UIWidget>("getOpacity", &UIWidget::getOpacity);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundOffsetX", &UIWidget::getBackgroundOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundOffsetY", &UIWidget::getBackgroundOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundOffset", &UIWidget::getBackgroundOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundWidth", &UIWidget::getBackgroundWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundHeight", &UIWidget::getBackgroundHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundSize", &UIWidget::getBackgroundSize);
+    g_lua.bindClassMemberFunction<UIWidget>("getBackgroundRect", &UIWidget::getBackgroundRect);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconColor", &UIWidget::getIconColor);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconOffsetX", &UIWidget::getIconOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconOffsetY", &UIWidget::getIconOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconOffset", &UIWidget::getIconOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconWidth", &UIWidget::getIconWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconHeight", &UIWidget::getIconHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconSize", &UIWidget::getIconSize);
+    g_lua.bindClassMemberFunction<UIWidget>("getIconRect", &UIWidget::getIconRect);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderTopColor", &UIWidget::getBorderTopColor);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderRightColor", &UIWidget::getBorderRightColor);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderBottomColor", &UIWidget::getBorderBottomColor);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderLeftColor", &UIWidget::getBorderLeftColor);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderTopWidth", &UIWidget::getBorderTopWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderRightWidth", &UIWidget::getBorderRightWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderBottomWidth", &UIWidget::getBorderBottomWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getBorderLeftWidth", &UIWidget::getBorderLeftWidth);
     g_lua.bindClassMemberFunction<UIWidget>("getMarginTop", &UIWidget::getMarginTop);
     g_lua.bindClassMemberFunction<UIWidget>("getMarginRight", &UIWidget::getMarginRight);
     g_lua.bindClassMemberFunction<UIWidget>("getMarginBottom", &UIWidget::getMarginBottom);
     g_lua.bindClassMemberFunction<UIWidget>("getMarginLeft", &UIWidget::getMarginLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("getPaddingTop", &UIWidget::getPaddingTop);
+    g_lua.bindClassMemberFunction<UIWidget>("getPaddingRight", &UIWidget::getPaddingRight);
+    g_lua.bindClassMemberFunction<UIWidget>("getPaddingBottom", &UIWidget::getPaddingBottom);
+    g_lua.bindClassMemberFunction<UIWidget>("getPaddingLeft", &UIWidget::getPaddingLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("getOpacity", &UIWidget::getOpacity);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageSource", &UIWidget::setImageSource);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageClip", &UIWidget::setImageClip);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageOffsetX", &UIWidget::setImageOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageOffsetY", &UIWidget::setImageOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageOffset", &UIWidget::setImageOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageWidth", &UIWidget::setImageWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageHeight", &UIWidget::setImageHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageSize", &UIWidget::setImageSize);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageRect", &UIWidget::setImageRect);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageColor", &UIWidget::setImageColor);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageFixedRatio", &UIWidget::setImageFixedRatio);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageRepeated", &UIWidget::setImageRepeated);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageSmooth", &UIWidget::setImageSmooth);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageBorderTop", &UIWidget::setImageBorderTop);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageBorderRight", &UIWidget::setImageBorderRight);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageBorderBottom", &UIWidget::setImageBorderBottom);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageBorderLeft", &UIWidget::setImageBorderLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("setImageBorder", &UIWidget::setImageBorder);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageClip", &UIWidget::getImageClip);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageOffsetX", &UIWidget::getImageOffsetX);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageOffsetY", &UIWidget::getImageOffsetY);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageOffset", &UIWidget::getImageOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageWidth", &UIWidget::getImageWidth);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageHeight", &UIWidget::getImageHeight);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageSize", &UIWidget::getImageSize);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageRect", &UIWidget::getImageRect);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageColor", &UIWidget::getImageColor);
+    g_lua.bindClassMemberFunction<UIWidget>("isImageFixedRatio", &UIWidget::isImageFixedRatio);
+    g_lua.bindClassMemberFunction<UIWidget>("isImageSmooth", &UIWidget::isImageSmooth);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageBorderTop", &UIWidget::getImageBorderTop);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageBorderRight", &UIWidget::getImageBorderRight);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageBorderBottom", &UIWidget::getImageBorderBottom);
+    g_lua.bindClassMemberFunction<UIWidget>("getImageBorderLeft", &UIWidget::getImageBorderLeft);
+    g_lua.bindClassMemberFunction<UIWidget>("resizeToText", &UIWidget::resizeToText);
+    g_lua.bindClassMemberFunction<UIWidget>("clearText", &UIWidget::clearText);
+    g_lua.bindClassMemberFunction<UIWidget>("setText", &UIWidget::setText);
+    g_lua.bindClassMemberFunction<UIWidget>("setTextAlign", &UIWidget::setTextAlign);
+    g_lua.bindClassMemberFunction<UIWidget>("setTextOffset", &UIWidget::setTextOffset);
+    g_lua.bindClassMemberFunction<UIWidget>("setFont", &UIWidget::setFont);
     g_lua.bindClassMemberFunction<UIWidget>("getText", &UIWidget::getText);
     g_lua.bindClassMemberFunction<UIWidget>("getTextAlign", &UIWidget::getTextAlign);
     g_lua.bindClassMemberFunction<UIWidget>("getTextOffset", &UIWidget::getTextOffset);
     g_lua.bindClassMemberFunction<UIWidget>("getFont", &UIWidget::getFont);
     g_lua.bindClassMemberFunction<UIWidget>("getTextSize", &UIWidget::getTextSize);
-    g_lua.bindClassMemberFunction<UIWidget>("getLastFocusReason", &UIWidget::getLastFocusReason);
-    g_lua.bindClassMemberFunction<UIWidget>("getStyle", &UIWidget::getStyle);
-    g_lua.bindClassMemberFunction<UIWidget>("getStyleName", &UIWidget::getStyleName);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildren", &UIWidget::getChildren);
-    g_lua.bindClassMemberFunction<UIWidget>("getFocusedChild", &UIWidget::getFocusedChild);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildAfter", &UIWidget::getChildAfter);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildBefore", &UIWidget::getChildBefore);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildById", &UIWidget::getChildById);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildByPos", &UIWidget::getChildByPos);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildByIndex", &UIWidget::getChildByIndex);
-    g_lua.bindClassMemberFunction<UIWidget>("getFirstChild", &UIWidget::getFirstChild);
-    g_lua.bindClassMemberFunction<UIWidget>("getLastChild", &UIWidget::getLastChild);
-    g_lua.bindClassMemberFunction<UIWidget>("recursiveGetChildById", &UIWidget::recursiveGetChildById);
-    g_lua.bindClassMemberFunction<UIWidget>("recursiveGetChildByPos", &UIWidget::recursiveGetChildByPos);
-    g_lua.bindClassMemberFunction<UIWidget>("backwardsGetWidgetById", &UIWidget::backwardsGetWidgetById);
-    g_lua.bindClassMemberFunction<UIWidget>("addChild", &UIWidget::addChild);
-    g_lua.bindClassMemberFunction<UIWidget>("insertChild", &UIWidget::insertChild);
-    g_lua.bindClassMemberFunction<UIWidget>("removeChild", &UIWidget::removeChild);
-    g_lua.bindClassMemberFunction<UIWidget>("focusChild", &UIWidget::focusChild);
-    g_lua.bindClassMemberFunction<UIWidget>("focusNextChild", &UIWidget::focusNextChild);
-    g_lua.bindClassMemberFunction<UIWidget>("focusPreviousChild", &UIWidget::focusPreviousChild);
-    g_lua.bindClassMemberFunction<UIWidget>("moveChildToTop", &UIWidget::moveChildToTop);
-    g_lua.bindClassMemberFunction<UIWidget>("moveChildToIndex", &UIWidget::moveChildToIndex);
-    g_lua.bindClassMemberFunction<UIWidget>("lockChild", &UIWidget::lockChild);
-    g_lua.bindClassMemberFunction<UIWidget>("unlockChild", &UIWidget::unlockChild);
-    g_lua.bindClassMemberFunction<UIWidget>("isChildLocked", &UIWidget::isChildLocked);
-    g_lua.bindClassMemberFunction<UIWidget>("getChildIndex", &UIWidget::getChildIndex);
-    g_lua.bindClassMemberFunction<UIWidget>("updateParentLayout", &UIWidget::updateParentLayout);
-    g_lua.bindClassMemberFunction<UIWidget>("updateLayout", &UIWidget::updateLayout);
-    g_lua.bindClassMemberFunction<UIWidget>("applyStyle", &UIWidget::applyStyle);
 
     // UILayout
     g_lua.registerClass<UILayout>();
@@ -191,12 +288,6 @@ void Application::registerLuaFunctions()
     g_lua.bindClassMemberFunction<UIAnchorLayout>("centerIn", &UIAnchorLayout::centerIn);
     g_lua.bindClassMemberFunction<UIAnchorLayout>("fill", &UIAnchorLayout::fill);
 
-    // UIProgressBar
-    g_lua.registerClass<UIProgressBar, UIWidget>();
-    g_lua.bindClassStaticFunction<UIProgressBar>("create", []{ return UIProgressBarPtr(new UIProgressBar); } );
-    g_lua.bindClassMemberFunction<UIProgressBar>("getPercent", &UIProgressBar::getPercent);
-    g_lua.bindClassMemberFunction<UIProgressBar>("setPercent", &UIProgressBar::setPercent);
-
     // UILineEdit
     g_lua.registerClass<UILineEdit, UIWidget>();
     g_lua.bindClassStaticFunction<UILineEdit>("create", []{ return UILineEditPtr(new UILineEdit); } );
@@ -216,10 +307,6 @@ void Application::registerLuaFunctions()
     g_lua.bindClassMemberFunction<UILineEdit>("isAlwaysActive", &UILineEdit::isAlwaysActive);
     g_lua.bindClassMemberFunction<UILineEdit>("isTextHidden", &UILineEdit::isTextHidden);
 
-    // UICheckBox
-    g_lua.registerClass<UICheckBox, UIWidget>();
-    g_lua.bindClassStaticFunction<UICheckBox>("create", []{ return UICheckBoxPtr(new UICheckBox); } );
-
     // UIWindow
     g_lua.registerClass<UIWindow, UIWidget>();
     g_lua.bindClassStaticFunction<UIWindow>("create", []{ return UIWindowPtr(new UIWindow); } );

src/framework/luascript/luavaluecasts.h

@@ -40,6 +40,10 @@ bool luavalue_cast(int index, int& i);
 void push_luavalue(double d);
 bool luavalue_cast(int index, double& d);
 
+// float
+inline void push_luavalue(float f) { push_luavalue((double)f); }
+inline bool luavalue_cast(int index, float& f) { double d; bool r = luavalue_cast(index, d); f = d; return r; }
+
 // int8
 inline void push_luavalue(int8 v) { push_luavalue((int)v); }
 inline bool luavalue_cast(int index, int8& v) { int i; bool r = luavalue_cast(index, i); v = i; return r; }

src/framework/math/rect.h

@@ -42,6 +42,7 @@ public:
     TRect(const TRect<T>& other) : x1(other.x1), y1(other.y1), x2(other.x2), y2(other.y2) { }
     TRect(T x, T y, const TSize<T>& size) : x1(x), y1(y), x2(x+size.width()-1), y2(y+size.height()-1) { }
     TRect(const TPoint<T>& topLeft, const TSize<T>& size) : x1(topLeft.x), y1(topLeft.y), x2(x1+size.width()-1), y2(y1+size.height()-1) { }
+    TRect(const TPoint<T>& topLeft, int width, int height) : x1(topLeft.x), y1(topLeft.y), x2(x1+width-1), y2(y1+height-1) { }
 
     bool isNull() const { return x2 == x1 - 1 && y2 == y1 - 1; }
     bool isEmpty() const { return x1 > x2 || y1 > y2; }
@@ -78,21 +79,23 @@ public:
     void setBottomLeft(const TPoint<T> &p) { x1 = p.x; y2 = p.y; }
     void setWidth(T width) { x2 = x1 + width - 1; }
     void setHeight(T height) { y2 = y1 + height- 1; }
-    void resize(T width, T height) { x2 = x1 + width - 1; y2 = y1 + height - 1; }
-    void resize(const TSize<T>& size) { x2 = x1 + size.width() - 1; y2 = y1 + size.height() - 1; }
+    void setSize(const TSize<T>& size) { x2 = x1 + size.width() - 1; y2 = y1 + size.height() - 1; }
     void setRect(T x, T y, T width, T height) { x1 = x; y1 = y; x2 = (x + width - 1); y2 = (y + height - 1); }
     void setCoords(int left, int top, int right, int bottom) { x1 = left; y1 = top; x2 = right; y2 = bottom; }
 
-    void addLeft(T add) { x1 -= add; }
-    void addTop(T add) { y1 -= add; }
-    void addRight(T add) { x2 += add; }
-    void addBottom(T add) { y2 += add; }
-    void add(T top, T right, T bottom, T left) { x1 -= left; y1 -= top; x2 += right; y2 += bottom; }
+    void expandLeft(T add) { x1 -= add; }
+    void expandTop(T add) { y1 -= add; }
+    void expandRight(T add) { x2 += add; }
+    void expandBottom(T add) { y2 += add; }
+    void expand(T top, T right, T bottom, T left) { x1 -= left; y1 -= top; x2 += right; y2 += bottom; }
+    void expand(T add) { x1 -= add; y1 -= add; x2 += add; y2 += add; }
 
     void translate(T x, T y) { x1 += x; y1 += y; x2 += x; y2 += y; }
     void translate(const TPoint<T> &p) { x1 += p.x; y1 += p.y; x2 += p.x; y2 += p.y; }
-    void moveTo(T x, T y) { x2 += x - x1; y2 += y - y1; x1 = x; y1 = y; }
-    void moveTo(const TPoint<T> &p) { x2 += p.x - x1; y2 += p.y - y1; x1 = p.x; y1 = p.y; }
+    void resize(const TSize<T>& size) { x2 = x1 + size.width() - 1; y2 = y1 + size.height() - 1; }
+    void resize(T width, T height) { x2 = x1 + width - 1; y2 = y1 + height - 1; }
+    void move(T x, T y) { x2 += x - x1; y2 += y - y1; x1 = x; y1 = y; }
+    void move(const TPoint<T> &p) { x2 += p.x - x1; y2 += p.y - y1; x1 = p.x; y1 = p.y; }
     void moveLeft(T pos) { x2 += (pos - x1); x1 = pos; }
     void moveTop(T pos) { y2 += (pos - y1); y1 = pos; }
     void moveRight(T pos) { x1 += (pos - x2); x2 = pos; }
@@ -105,7 +108,7 @@ public:
     TRect<T> translated(int x, int y) const { return TRect<T>(TPoint<T>(x1 + x, y1 + y), TPoint<T>(x2 + x, y2 + y)); }
     TRect<T> translated(const TPoint<T> &p) const { return TRect<T>(TPoint<T>(x1 + p.x, y1 + p.y), TPoint<T>(x2 + p.x, y2 + p.y)); }
 
-    TRect<T> expanded(T pixels) const { return TRect<T>(TPoint<T>(x1 - pixels, y1 - pixels), TPoint<T>(x2 + pixels, y2 + pixels)); }
+    TRect<T> expanded(T add) const { return TRect<T>(TPoint<T>(x1 - add, y1 - add), TPoint<T>(x2 + add, y2 + add)); }
 
     void moveCenter(const TPoint<T> &p) {
         T w = x2 - x1;

src/framework/ui/declarations.h

@@ -27,11 +27,7 @@
 
 class UIManager;
 class UIWidget;
-class UILabel;
-class UIButton;
 class UILineEdit;
-class UICheckBox;
-class UIProgressBar;
 class UIFrameCounter;
 class UIWindow;
 class UILayout;
@@ -41,11 +37,7 @@ class UIAnchorLayout;
 typedef std::shared_ptr<UIWidget> UIWidgetPtr;
 typedef std::weak_ptr<UIWidget> UIWidgetWeakPtr;
 
-typedef std::shared_ptr<UILabel> UILabelPtr;
-typedef std::shared_ptr<UIButton> UIButtonPtr;
 typedef std::shared_ptr<UILineEdit> UILineEditPtr;
-typedef std::shared_ptr<UICheckBox> UICheckBoxPtr;
-typedef std::shared_ptr<UIProgressBar> UIProgressBarPtr;
 typedef std::shared_ptr<UIFrameCounter> UIFrameCounterPtr;
 typedef std::shared_ptr<UIWindow> UIWindowPtr;
 typedef std::shared_ptr<UILayout> UILayoutPtr;

src/framework/ui/ui.h

@@ -28,8 +28,6 @@
 #include "uilineedit.h"
 #include "uiwindow.h"
 #include "uiframecounter.h"
-#include "uiprogressbar.h"
-#include "uicheckbox.h"
 #include "uilayout.h"
 #include "uiverticallayout.h"
 #include "uianchorlayout.h"

src/framework/ui/uicheckbox.cpp

@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "uicheckbox.h"
-#include "uitranslator.h"
-#include <framework/otml/otmlnode.h>
-#include <framework/graphics/image.h>
-#include <framework/graphics/font.h>
-#include <framework/graphics/graphics.h>
-#include <framework/core/eventdispatcher.h>
-
-UICheckBox::UICheckBox()
-{
-    m_focusable = false;
-    m_textAlign = Fw::AlignLeft;
-}
-
-void UICheckBox::render()
-{
-    if(m_image) {
-        Rect boxRect;
-        boxRect.resize(m_boxSize);
-        boxRect.moveLeft(m_rect.left());
-        boxRect.moveVerticalCenter(m_rect.verticalCenter());
-        g_painter.setColor(m_backgroundColor);
-        m_image->draw(boxRect);
-    }
-
-    if(m_text.length()) {
-        Rect textRect(m_rect);
-        textRect.setTopLeft(textRect.topLeft() + m_textOffset);
-        m_font->renderText(m_text, textRect, m_textAlign, m_color);
-    }
-}
-
-void UICheckBox::onMouseRelease(const Point& mousePos, Fw::MouseButton button)
-{
-    if(isPressed() && getRect().contains(mousePos))
-        setChecked(!isChecked());
-}
-
-void UICheckBox::onStyleApply(const std::string& styleName, const OTMLNodePtr& styleNode)
-{
-    UIWidget::onStyleApply(styleName, styleNode);
-
-    for(OTMLNodePtr node : styleNode->children()) {
-        if(node->tag() == "text-offset")
-            m_textOffset = node->value<Point>();
-        else if(node->tag() == "text")
-            m_text = node->value();
-        else if(node->tag() == "box-size")
-            m_boxSize = node->value<Size>();
-        else if(node->tag() == "text-align")
-            m_textAlign = Fw::translateAlignment(node->value());
-        else if(node->tag() == "checked") {
-            // must be scheduled because setChecked can change the style again
-            g_dispatcher.addEvent(std::bind(&UICheckBox::setChecked, asUICheckBox(), node->value<bool>()));
-        }
-    }
-}

src/framework/ui/uicheckbox.h

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef UICHECKBOX_H
-#define UICHECKBOX_H
-
-#include "uiwidget.h"
-
-class UICheckBox : public UIWidget
-{
-public:
-    UICheckBox();
-    void render();
-
-    void setText(const std::string& text) { m_text = text; }
-    std::string getText() { return m_text; }
-
-    UICheckBoxPtr asUICheckBox() { return std::static_pointer_cast<UICheckBox>(shared_from_this()); }
-
-protected:
-    virtual void onStyleApply(const std::string& styleName, const OTMLNodePtr& styleNode);
-    virtual void onMouseRelease(const Point& mousePos, Fw::MouseButton button);
-
-    std::string m_text;
-    Size m_boxSize;
-    Point m_textOffset;
-    Fw::AlignmentFlag m_textAlign;
-};
-
-#endif

src/framework/ui/uiframecounter.cpp

@@ -36,9 +36,9 @@ UIFrameCounter::UIFrameCounter()
     m_frameCount = 0;
 }
 
-void UIFrameCounter::render()
+void UIFrameCounter::draw()
 {
-    UIWidget::render();
+    UIWidget::draw();
 
     if(g_clock.ticksElapsed(m_lastFrameTicks) >= 1000) {
         m_fpsText = Fw::mkstr("FPS: ", m_frameCount);

src/framework/ui/uiframecounter.h

@@ -29,7 +29,7 @@ class UIFrameCounter : public UIWidget
 {
 public:
     UIFrameCounter();
-    virtual void render();
+    virtual void draw();
 
     void setAlign(Fw::AlignmentFlag align) { m_align = align; }
     Fw::AlignmentFlag getAlign() { return m_align; }

src/framework/ui/uiimage.cpp

@@ -1,41 +0,0 @@
-#include "uiimage.h"
-#include <framework/otml/otmlnode.h>
-
-void UIImage::draw(const Rect& screenCoords)
-{
-
-}
-
-void UIImage::applyStyle(const OTMLNodePtr& styleNode)
-{
-    /*
-    for(const OTMLNodePtr& node : styleNode->children()) {
-        if(node->tag() == "image-source")
-            setImageSource(node->value());
-        else if(node->tag() == "image-clip")
-            setImageClip(node->value<Rect>());
-        else if(node->tag() == "image-rect")
-            setImageRect(node->value<Rect>());
-        else if(node->tag() == "image-fixed-ratio")
-            setImageFixedRatio(node->value<bool>());
-        else if(node->tag() == "image-repeated")
-            setImageRepeated(node->value<bool>());
-        else if(node->tag() == "image-smooth")
-            setImageSmooth(node->value<bool>());
-        else if(node->tag() == "image-color")
-            setImageColor(node->value<Color>());
-        else if(node->tag() == "image-border-top")
-            setImageBorderTop(node->value<int>());
-        else if(node->tag() == "image-border-right")
-            setImageBorderRight(node->value<int>());
-        else if(node->tag() == "image-border-bottom")
-            setImageBorderBottom(node->value<int>());
-        else if(node->tag() == "image-border-left")
-            setImageBorderLeft(node->value<int>());
-        else if(node->tag() == "image-border") {
-
-        }
-    }
-    */
-}
-

src/framework/ui/uiimage.h

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef UIIMAGE_H
-#define UIIMAGE_H
-
-#include <framework/graphics/declarations.h>
-#include <framework/otml/declarations.h>
-#include "declarations.h"
-
-class UIImage
-{
-public:
-    void draw(const Rect& screenCoords);
-    void applyStyle(const OTMLNodePtr& styleNode);
-
-    void setImageSource(const std::string& source);
-    void setImageClip(const Rect& clipRect);
-    void setImageRect(const Rect& rect);
-    void setImageFixedRatio(bool fixedRatio);
-    void setImageRepeated(bool repeated);
-    void setImageSmooth(bool smooth);
-    void setImageColor(const Color& color);
-    void setImageBorderTop(int border);
-    void setImageBorderRight(int border);
-    void setImageBorderBottom(int border);
-    void setImageBorderLeft(int border);
-
-protected:
-    TexturePtr m_imageTexture;
-    Rect m_imageClipRect;
-    Rect m_imageRect;
-    Boolean<false> m_imageFixedRatio;
-    Boolean<false> m_imageRepeated;
-    Color m_imageColor;
-
-    // border image coords
-    Rect m_leftBorderTexCoords;
-    Rect m_rightBorderTexCoords;
-    Rect m_topBorderTexCoords;
-    Rect m_bottomBorderTexCoords;
-    Rect m_topLeftCornerTexCoords;
-    Rect m_topRightCornerTexCoords;
-    Rect m_bottomLeftCornerTexCoords;
-    Rect m_bottomRightCornerTexCoords;
-    Rect m_centerTexCoords;
-    Size m_bordersSize;
-};
-
-#endif

src/framework/ui/uilayout.cpp

@@ -26,6 +26,9 @@
 
 void UILayout::update()
 {
+    if(m_updateDisabled)
+        return;
+
     assert(!m_updating);
     m_updating = true;
     internalUpdate();
@@ -34,7 +37,7 @@ void UILayout::update()
 
 void UILayout::updateLater()
 {
-    if(m_updateScheduled)
+    if(m_updateDisabled || m_updateScheduled)
         return;
 
     if(!getParentWidget())

src/framework/ui/uilayout.h

@@ -38,9 +38,13 @@ public:
     virtual void applyStyle(const OTMLNodePtr& styleNode) { }
     virtual void addWidget(const UIWidgetPtr& widget) = 0;
     virtual void removeWidget(const UIWidgetPtr& widget) = 0;
+    void disableUpdates() { m_updateDisabled = true; }
+    void enableUpdates() { m_updateDisabled = false; }
 
+    void setParent(UIWidgetPtr parentWidget) { m_parentWidget = parentWidget; }
     UIWidgetPtr getParentWidget() { return m_parentWidget.lock(); }
 
+    bool isUpdateDisabled() { return m_updateDisabled; }
     bool isUpdating() { return m_updating; }
     virtual bool needsUpdatesOnChildChange() { return false; }
 
@@ -51,6 +55,7 @@ public:
 protected:
     virtual void internalUpdate() = 0;
 
+    Boolean<false> m_updateDisabled;
     Boolean<false> m_updating;
     Boolean<false> m_updateScheduled;
     UIWidgetWeakPtr m_parentWidget;

src/framework/ui/uilineedit.cpp

@@ -38,7 +38,7 @@ UILineEdit::UILineEdit()
     blinkCursor();
 }
 
-void UILineEdit::renderSelf()
+void UILineEdit::drawSelf()
 {
     drawBackground(m_rect);
     drawBorder(m_rect);
@@ -140,8 +140,8 @@ void UILineEdit::update()
     }
 
     Rect textScreenCoords = m_rect;
-    textScreenCoords.addLeft(-m_textHorizontalMargin);
-    textScreenCoords.addRight(-m_textHorizontalMargin);
+    textScreenCoords.expandLeft(-m_textHorizontalMargin);
+    textScreenCoords.expandRight(-m_textHorizontalMargin);
     m_drawArea = textScreenCoords;
 
     if(m_textAlign & Fw::AlignBottom) {
@@ -339,8 +339,8 @@ int UILineEdit::getTextPos(Point pos)
     int candidatePos = -1;
     for(int i=0;i<textLength;++i) {
         Rect clickGlyphRect = m_glyphsCoords[i];
-        clickGlyphRect.addTop(m_font->getYOffset() + m_font->getGlyphSpacing().height());
-        clickGlyphRect.addLeft(m_font->getGlyphSpacing().width()+1);
+        clickGlyphRect.expandTop(m_font->getYOffset() + m_font->getGlyphSpacing().height());
+        clickGlyphRect.expandLeft(m_font->getGlyphSpacing().width()+1);
         if(clickGlyphRect.contains(pos))
             return i;
         else if(pos.y >= clickGlyphRect.top() && pos.y <= clickGlyphRect.bottom()) {

src/framework/ui/uilineedit.h

@@ -30,7 +30,7 @@ class UILineEdit : public UIWidget
 public:
     UILineEdit();
 
-    virtual void renderSelf();
+    virtual void drawSelf();
 
 private:
     void update();

src/framework/ui/uimanager.cpp

@@ -47,12 +47,12 @@ void UIManager::terminate()
 
 void UIManager::render()
 {
-    m_rootWidget->render();
+    m_rootWidget->draw();
 }
 
 void UIManager::resize(const Size& size)
 {
-    m_rootWidget->resize(g_window.getSize());
+    m_rootWidget->setSize(g_window.getSize());
 }
 
 void UIManager::inputEvent(const InputEvent& event)

src/framework/ui/uiprogressbar.cpp

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "uiprogressbar.h"
-#include <framework/graphics/graphics.h>
-#include <framework/otml/otmlnode.h>
-
-UIProgressBar::UIProgressBar()
-{
-    m_phantom = false;
-    m_focusable = false;
-    m_percent = 0;
-}
-
-void UIProgressBar::render()
-{
-    UIWidget::render();
-
-    g_painter.setColor(m_color);
-    g_painter.drawBoundingRect(m_rect, 1);
-
-    Rect fillRect = m_rect.expanded(-1);
-    fillRect.setWidth(fillRect.width() * m_percent / 100.0);
-
-    g_painter.setColor(m_backgroundColor);
-    g_painter.drawFilledRect(fillRect);
-}
-
-void UIProgressBar::setPercent(double percent)
-{
-    if(percent == NAN)
-        percent = 0;
-    m_percent = std::min(std::max(percent, 0.0), 100.0);
-}

src/framework/ui/uiprogressbar.h

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef UIPROGRESSBAR_H
-#define UIPROGRESSBAR_H
-
-#include "uiwidget.h"
-
-class UIProgressBar : public UIWidget
-{
-public:
-    UIProgressBar();
-    virtual void render();
-
-    void setPercent(double percent);
-    double getPercent() { return m_percent; }
-
-private:
-    double m_percent;
-};
-
-#endif

src/framework/ui/uiverticallayout.cpp

@@ -97,7 +97,7 @@ void UIVerticalLayout::internalUpdate()
         pos.y += gap;
         prefferedHeight += gap;
 
-        if(widget->isSizeFixed()) {
+        if(widget->isFixedSize()) {
             // center it
             pos.x = childrenRect.left() + (childrenRect.width() - (widget->getMarginLeft() + widget->getWidth() + widget->getMarginRight()))/2;
             pos.x = std::max(pos.x, parentWidget->getX());

src/framework/ui/uiwidget.h

@@ -28,74 +28,67 @@
 #include <framework/graphics/declarations.h>
 #include <framework/otml/otmlnode.h>
 #include <framework/graphics/font.h>
+#include <framework/graphics/coordsbuffer.h>
+
+template<typename T = int>
+struct EdgeGroup {
+    EdgeGroup() { top = right = bottom = left = T(0); }
+    void set(T value) { top = right = bottom = left = value; }
+    T top;
+    T right;
+    T bottom;
+    T left;
+};
 
 class UIWidget : public LuaObject
 {
+// widget core
 public:
     UIWidget();
-    virtual ~UIWidget() { }
-
-    void destroy();
+    virtual ~UIWidget();
 
 protected:
-    virtual void render();
-    virtual void renderSelf();
-    virtual void renderChildren();
+    virtual void draw();
+    virtual void drawSelf();
+    virtual void drawChildren();
 
     friend class UIManager;
 
-    void drawBackground(const Rect& screenCoords);
-    void drawBorder(const Rect& screenCoords);
-    void drawImage(const Rect& screenCoords);