Fix problem with initially attached Commands

qooxdoo · Jan 25, 2017 · b5e822d · b5e822d
1 parent d7f58a2
commit b5e822d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/framework/source/class/qx/ui/core/MExecutable.js b/framework/source/class/qx/ui/core/MExecutable.js
@@ -117,13 +117,15 @@ qx.Mixin.define("qx.ui.core.MExecutable",
      * @param e {qx.event.type.Event} The execute event of the command.
      */
     __onCommandExecute : function(e) {
-      if (this.__semaphore) {
-        this.__semaphore = false;
-        return;
-      }
       if (this.isEnabled()) {
-        this.__semaphore = true;
-        this.execute();
+        if (this.__semaphore) {
+          this.__semaphore = false;
+          return;
+        }
+        if (this.isEnabled()) {
+          this.__semaphore = true;
+          this.execute();
+        }
       }
     },
 
@@ -151,6 +153,11 @@ qx.Mixin.define("qx.ui.core.MExecutable",
       for (var i = 0; i < this._bindableProperties.length; i++) {
         var property = this._bindableProperties[i];
 
+        // Skip "enabled"
+        if (property === "enabled") {
+          continue;
+        }
+
         // remove the old binding
         if (old != null && !old.isDisposed() && ids[property] != null)
         {
@@ -167,6 +174,7 @@ qx.Mixin.define("qx.ui.core.MExecutable",
             // check also for themed values [BUG #5906]
             if (selfPropertyValue == null) {
               // update the appearance to make sure every themed property is up to date
+              this.$$resyncNeeded = true;
               this.syncAppearance();
               selfPropertyValue = qx.util.PropertyUtil.getThemeValue(
                 this, property

diff --git a/framework/source/class/qx/ui/core/Widget.js b/framework/source/class/qx/ui/core/Widget.js
@@ -3619,6 +3619,14 @@ qx.Class.define("qx.ui.core.Widget",
         }
       }
 
+      // If the appearance is already synced after the child control
+      // we need to update the appearance now, because the selector
+      // might be not correct in certain cases.
+      if (control.$$resyncNeeded) {
+        delete control.$$resyncNeeded;
+        control.updateAppearance();
+      }
+
       this.fireDataEvent("createChildControl", control);
 
       // Register control and return