(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -20,6 +20,8 @@ namespace Barotrauma
        public OnButtonDownHandler OnButtonDown;

        public bool CanBeSelected = true;
+
+        private Color? defaultTextColor;
        
        public override bool Enabled 
        { 
@@ -30,7 +32,7 @@ namespace Barotrauma

            set
            {
-                if (value == enabled) return;
+                if (value == enabled) { return; }
                enabled = value;
                if (color.A == 0)
                {