Browse Source

fix for f key not working #1205

JimMarlowe 9 years ago
parent
commit
572a38c5b2
2 changed files with 15 additions and 6 deletions
  1. 7 1
      Source/Atomic/UI/UIWidget.h
  2. 8 5
      Source/ThirdParty/TurboBadger/tb_widgets.h

+ 7 - 1
Source/Atomic/UI/UIWidget.h

@@ -119,7 +119,13 @@ enum UI_EVENT_TYPE {
     UI_EVENT_TYPE_TAB_CHANGED = 14, // tb::EVENT_TYPE_TAB_CHANGED,
 
     /** Custom event. Not used internally. ref_id may be used for additional type info. */
-    UI_EVENT_TYPE_CUSTOM = 15 // tb::EVENT_TYPE_CUSTOM
+    UI_EVENT_TYPE_CUSTOM = 15, // tb::EVENT_TYPE_CUSTOM
+
+    /** Local Turbobadger touch events */
+    UI_EVENT_TYPE_TOUCH_DOWN,
+    UI_EVENT_TYPE_TOUCH_UP,
+    UI_EVENT_TYPE_TOUCH_MOVE,
+    UI_EVENT_TYPE_TOUCH_CANCEL
 };
 
 /** Defines widget z level relative to another widget, used with TBWidget::AddChildRelative. */

+ 8 - 5
Source/ThirdParty/TurboBadger/tb_widgets.h

@@ -57,10 +57,6 @@ enum EVENT_TYPE {
     EVENT_TYPE_POINTER_MOVE,
     EVENT_TYPE_RIGHT_POINTER_DOWN,
     EVENT_TYPE_RIGHT_POINTER_UP,
-    EVENT_TYPE_TOUCH_DOWN,
-    EVENT_TYPE_TOUCH_UP,
-    EVENT_TYPE_TOUCH_MOVE,
-    EVENT_TYPE_TOUCH_CANCEL,
     EVENT_TYPE_WHEEL,
 
     /** Invoked after changing text in a TBTextField, changing selected item
@@ -90,7 +86,14 @@ enum EVENT_TYPE {
     EVENT_TYPE_TAB_CHANGED,
 
     /** Custom event. Not used internally. ref_id may be used for additional type info. */
-    EVENT_TYPE_CUSTOM
+    EVENT_TYPE_CUSTOM,
+    
+    /** Turbobadger implementation for touch events */
+    EVENT_TYPE_TOUCH_DOWN,
+    EVENT_TYPE_TOUCH_UP,
+    EVENT_TYPE_TOUCH_MOVE,
+    EVENT_TYPE_TOUCH_CANCEL
+
 };
 
 enum MODIFIER_KEYS {