diff --git a/modules/addon_console/console.otmod b/modules/addon_console/console.otmod index 628e0e97..fdecb18b 100644 --- a/modules/addon_console/console.otmod +++ b/modules/addon_console/console.otmod @@ -6,7 +6,7 @@ Module // console can be loaded after core autoLoad: true - autoLoadPriority: 20 + autoLoadPriority: 1000 onLoad: | require 'console' diff --git a/modules/addon_playground/playground.lua b/modules/addon_playground/playground.lua index b300e634..380330d0 100644 --- a/modules/addon_playground/playground.lua +++ b/modules/addon_playground/playground.lua @@ -1,11 +1,2 @@ -- place any code for testing purposes here - -function init() - local box = createWidget('ComboBox') - box:moveTo({x=100, y=8}) - box:addOption('Option 1') - box:addOption('Option 2') - displayUI(box) -end - -addEvent(init) \ No newline at end of file +--scheduleEvent(function() dumpWidgets() end, 100) \ No newline at end of file diff --git a/modules/addon_playground/playground.otmod b/modules/addon_playground/playground.otmod index 6fe92c90..5b0567ad 100644 --- a/modules/addon_playground/playground.otmod +++ b/modules/addon_playground/playground.otmod @@ -1,6 +1,7 @@ Module name: playground autoLoad: true + autoLoadPriority: 1000 onLoad: | require 'playground' diff --git a/modules/client_background/background.otui b/modules/client_background/background.otui index c88b9b87..c456e845 100644 --- a/modules/client_background/background.otui +++ b/modules/client_background/background.otui @@ -10,3 +10,4 @@ Panel anchors.bottom: parent.bottom margin-top: 1 focusable: false + diff --git a/modules/core_styles/styles/comboboxes.otui b/modules/core_styles/styles/comboboxes.otui index 2323ac5b..d2b8e14f 100644 --- a/modules/core_styles/styles/comboboxes.otui +++ b/modules/core_styles/styles/comboboxes.otui @@ -1,6 +1,8 @@ ComboBoxPopupMenuButton < UIButton font: verdana-11px-antialised background-color: alpha + text-align: left + text-offset: 2 0 color: #aaaaaa height: 18 margin-left: 1 diff --git a/modules/core_styles/styles/separators.otui b/modules/core_styles/styles/separators.otui index c2593730..8ab0dc19 100644 --- a/modules/core_styles/styles/separators.otui +++ b/modules/core_styles/styles/separators.otui @@ -4,3 +4,4 @@ HorizontalSeparator < UIWidget border.top: 2 height: 2 phantom: true + focusable: false \ No newline at end of file diff --git a/modules/game_viplist/addvip.otui b/modules/game_viplist/addvip.otui index 7d7a3a57..542a462e 100644 --- a/modules/game_viplist/addvip.otui +++ b/modules/game_viplist/addvip.otui @@ -1,7 +1,9 @@ MainWindow size: 256 128 title: Add to VIP list - + @onEnter: VipList.addVip() + @onEscape: VipList.destroyAddWindow() + Label text: Please enter a character name: anchors.top: parent.top @@ -10,7 +12,7 @@ MainWindow margin-left: 16 margin-right: 16 margin-top: 32 - + LineEdit id: name anchors.top: prev.bottom @@ -19,7 +21,7 @@ MainWindow margin-left: 16 margin-right: 16 margin-top: 4 - + HorizontalSeparator anchors.left: parent.left anchors.right: parent.right