diff Editor.lua @ 264:d2e55b61e5e6 stable

Merge 1.1 beta 6 to stable
author Flick
date Fri, 06 May 2011 15:52:21 -0700
parents 5694618cef7f
children c27596828276
line wrap: on
line diff
--- a/Editor.lua	Tue Apr 12 16:07:21 2011 -0700
+++ b/Editor.lua	Fri May 06 15:52:21 2011 -0700
@@ -255,10 +255,19 @@
               func = function() ReAction:EraseBar(bar) end,
               order = 2
             },
+            clickDown = {
+              type = "toggle",
+              name = L["Activate on Down"],
+              desc = L["Activate the button when the key or mouse button is pressed down instead of when it is released"],
+              order = 3,
+              set  = function(info, value) bar:GetConfig().clickDown = value; ReAction:RebuildAll() end,
+              get  = function() return bar:GetConfig().clickDown end,
+            },
             anchor = {
               type = "group",
               name = L["Anchor"],
               inline = true,
+              order = 4,
               args = {
                 frame = {
                   type = "input",
@@ -321,7 +330,6 @@
                   order = 5
                 },
               },
-              order = 3
             },
             alpha = {
               type = "range",
@@ -1015,7 +1023,7 @@
         },
         ordering = {
           name = L["Evaluation Order"],
-          desc = L["State transitions are evaluated in the order listed:\nMove a state up or down to change the order"],
+          desc = L["State transitions are evaluated in the order listed: Move a state up or down to change the order"],
           order = 2,
           type = "group",
           inline = true,