ecere/gui/Window: Fixed caret showing on disabled controls
authorJerome St-Louis <jerome@ecere.com>
Tue, 11 Mar 2014 04:43:47 +0000 (00:43 -0400)
committerJerome St-Louis <jerome@ecere.com>
Tue, 11 Mar 2014 04:43:47 +0000 (00:43 -0400)
- This was particularly annoying in the global settings/compilers dialog, when selecting the toolchain tab of the default compiler

ecere/src/gui/Window.ec

index ee9574e..ce6af1c 100644 (file)
@@ -3491,7 +3491,7 @@ private:
                this.active = active;
                if(acquiredInput)
                   AcquireInputEx(active);
-               if(active)
+               if(active && isEnabled)
                {
                   if(caretSize)
                   {
@@ -6955,7 +6955,7 @@ public:
          caretPos.x = x;
          caretPos.y = y;
          caretSize = size;
-         if(active && !style.interim)
+         if(active && !style.interim && isEnabled)
          {
             if(visible || !guiApp.caretOwner)
                guiApp.caretOwner = size ? this : null;