Author: tchemit Date: 2008-02-24 18:53:03 +0000 (Sun, 24 Feb 2008) New Revision: 225 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: modification recuperation hideActionText TODO a revoir car cela ne sert pas a grand chose puisque la valeur par defaut est false dans swing... Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-24 18:51:57 UTC (rev 224) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-24 18:53:03 UTC (rev 225) @@ -121,7 +121,6 @@ } Boolean value = (Boolean) action.getValue("hideActionText"); - component.setHideActionText(value != null && value); action.setEnabled(true); result.add(action); @@ -325,8 +324,12 @@ } //TODO Convert it from String result.putValue(Action.ACCELERATOR_KEY, anno.accelerator()); - - result.putValue("hideActionText", anno.hideActionText()); + if (component == null) { + result.putValue("hideActionText", anno.hideActionText()); + } else { + boolean actionText = component.getHideActionText(); + result.putValue("hideActionText", anno.hideActionText() || actionText); + } result.putValue(Action.SELECTED_KEY, anno.selected()); result.setEnabled(anno.enabled());
participants (1)
-
tchemit@users.labs.libre-entreprise.org