Browse Source

fix game losing focus, handle enter/escape on add vip window

Eduardo Bart 9 years ago
parent
commit
4620f71444

+ 1
- 1
modules/addon_console/console.otmod View File

@@ -6,7 +6,7 @@ Module
6 6
 
7 7
   // console can be loaded after core
8 8
   autoLoad: true
9
-  autoLoadPriority: 20
9
+  autoLoadPriority: 1000
10 10
 
11 11
   onLoad: |
12 12
     require 'console'

+ 1
- 10
modules/addon_playground/playground.lua View File

@@ -1,11 +1,2 @@
1 1
 -- place any code for testing purposes here
2
-
3
-function init()
4
-  local box = createWidget('ComboBox')
5
-  box:moveTo({x=100, y=8})
6
-  box:addOption('Option 1')
7
-  box:addOption('Option 2')
8
-  displayUI(box)
9
-end
10
-
11
-addEvent(init)
2
+--scheduleEvent(function() dumpWidgets() end, 100)

+ 1
- 0
modules/addon_playground/playground.otmod View File

@@ -1,6 +1,7 @@
1 1
 Module
2 2
   name: playground
3 3
   autoLoad: true
4
+  autoLoadPriority: 1000
4 5
   onLoad: |
5 6
     require 'playground'
6 7
 

+ 1
- 0
modules/client_background/background.otui View File

@@ -10,3 +10,4 @@ Panel
10 10
   anchors.bottom: parent.bottom
11 11
   margin-top: 1
12 12
   focusable: false
13
+

+ 2
- 0
modules/core_styles/styles/comboboxes.otui View File

@@ -1,6 +1,8 @@
1 1
 ComboBoxPopupMenuButton < UIButton
2 2
   font: verdana-11px-antialised
3 3
   background-color: alpha
4
+  text-align: left
5
+  text-offset: 2 0
4 6
   color: #aaaaaa
5 7
   height: 18
6 8
   margin-left: 1

+ 1
- 0
modules/core_styles/styles/separators.otui View File

@@ -4,3 +4,4 @@ HorizontalSeparator < UIWidget
4 4
     border.top: 2
5 5
   height: 2
6 6
   phantom: true
7
+  focusable: false

+ 5
- 3
modules/game_viplist/addvip.otui View File

@@ -1,7 +1,9 @@
1 1
 MainWindow
2 2
   size: 256 128
3 3
   title: Add to VIP list
4
-  
4
+  @onEnter: VipList.addVip()
5
+  @onEscape: VipList.destroyAddWindow()
6
+
5 7
   Label
6 8
     text: Please enter a character name:
7 9
     anchors.top: parent.top
@@ -10,7 +12,7 @@ MainWindow
10 12
     margin-left: 16
11 13
     margin-right: 16
12 14
     margin-top: 32
13
-    
15
+
14 16
   LineEdit
15 17
     id: name
16 18
     anchors.top: prev.bottom
@@ -19,7 +21,7 @@ MainWindow
19 21
     margin-left: 16
20 22
     margin-right: 16
21 23
     margin-top: 4
22
-    
24
+
23 25
   HorizontalSeparator
24 26
     anchors.left: parent.left
25 27
     anchors.right: parent.right

Loading…
Cancel
Save