--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/CheckBoxSkin.java 2015-09-03 15:18:02.165890900 -0700 +++ /dev/null 2015-09-03 15:18:03.000000000 -0700 @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package com.sun.javafx.scene.control.skin; - -import javafx.scene.control.CheckBox; -import javafx.scene.layout.StackPane; - -import com.sun.javafx.scene.control.behavior.ButtonBehavior; -import javafx.geometry.NodeOrientation; - -/** - * Skin for tri state selection Control. - */ -public class CheckBoxSkin extends LabeledSkinBase> { - - private final StackPane box = new StackPane(); - private StackPane innerbox; - - public CheckBoxSkin(CheckBox checkbox) { - super(checkbox, new ButtonBehavior(checkbox)); - - box.getStyleClass().setAll("box"); - innerbox = new StackPane(); - innerbox.getStyleClass().setAll("mark"); - innerbox.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT); - box.getChildren().add(innerbox); - updateChildren(); - } - - @Override protected void updateChildren() { - super.updateChildren(); - if (box != null) { - getChildren().add(box); - } - } - - @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { - return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.minWidth(-1)); - } - - @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { - return Math.max(super.computeMinHeight(width - box.minWidth(-1), topInset, rightInset, bottomInset, leftInset), - topInset + box.minHeight(-1) + bottomInset); - } - - @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { - return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.prefWidth(-1)); - } - - @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { - return Math.max(super.computePrefHeight(width - box.prefWidth(-1), topInset, rightInset, bottomInset, leftInset), - topInset + box.prefHeight(-1) + bottomInset); - } - - @Override protected void layoutChildren(final double x, final double y, - final double w, final double h) { - final CheckBox checkBox = getSkinnable(); - final double boxWidth = snapSize(box.prefWidth(-1)); - final double boxHeight = snapSize(box.prefHeight(-1)); - final double computeWidth = Math.max(checkBox.prefWidth(-1), checkBox.minWidth(-1)); - final double labelWidth = Math.min( computeWidth - boxWidth, w - snapSize(boxWidth)); - final double labelHeight = Math.min(checkBox.prefHeight(labelWidth), h); - final double maxHeight = Math.max(boxHeight, labelHeight); - final double xOffset = Utils.computeXOffset(w, labelWidth + boxWidth, checkBox.getAlignment().getHpos()) + x; - final double yOffset = Utils.computeYOffset(h, maxHeight, checkBox.getAlignment().getVpos()) + x; - - layoutLabelInArea(xOffset + boxWidth, yOffset, labelWidth, maxHeight, checkBox.getAlignment()); - box.resize(boxWidth, boxHeight); - positionInArea(box, xOffset, yOffset, boxWidth, maxHeight, 0, checkBox.getAlignment().getHpos(), checkBox.getAlignment().getVpos()); - } -} --- /dev/null 2015-09-03 15:18:03.000000000 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/skin/CheckBoxSkin.java 2015-09-03 15:18:01.354844500 -0700 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javafx.scene.control.skin; + +import com.sun.javafx.scene.control.behavior.BehaviorBase; +import com.sun.javafx.scene.control.skin.Utils; +import javafx.scene.Node; +import javafx.scene.control.Button; +import javafx.scene.control.CheckBox; +import com.sun.javafx.scene.control.behavior.ButtonBehavior; +import javafx.scene.control.Control; +import javafx.scene.layout.StackPane; + +import javafx.geometry.NodeOrientation; + +/** + * Default skin implementation for the tri-state {@link CheckBox} control. + * + * @see CheckBox + * @since 9 + */ +public class CheckBoxSkin extends LabeledSkinBase { + + /*************************************************************************** + * * + * Private fields * + * * + **************************************************************************/ + + private final StackPane box = new StackPane(); + private StackPane innerbox; + private final BehaviorBase behavior; + + + + /*************************************************************************** + * * + * Constructors * + * * + **************************************************************************/ + + /** + * Creates a new CheckBoxSkin instance, installing the necessary child + * nodes into the Control {@link Control#getChildren() children} list, as + * well as the necessary input mappings for handling key, mouse, etc events. + * + * @param control The control that this skin should be installed onto. + */ + public CheckBoxSkin(CheckBox control) { + super(control); + + // install default input map for the CheckBox control + behavior = new ButtonBehavior<>(control); +// control.setInputMap(behavior.getInputMap()); + + box.getStyleClass().setAll("box"); + innerbox = new StackPane(); + innerbox.getStyleClass().setAll("mark"); + innerbox.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT); + box.getChildren().add(innerbox); + updateChildren(); + } + + + + /*************************************************************************** + * * + * Public API * + * * + **************************************************************************/ + + /** {@inheritDoc} */ + @Override public void dispose() { + super.dispose(); + + if (behavior != null) { + behavior.dispose(); + } + } + + /** {@inheritDoc} */ + @Override protected void updateChildren() { + super.updateChildren(); + if (box != null) { + getChildren().add(box); + } + } + + /** {@inheritDoc} */ + @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { + return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.minWidth(-1)); + } + + /** {@inheritDoc} */ + @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { + return Math.max(super.computeMinHeight(width - box.minWidth(-1), topInset, rightInset, bottomInset, leftInset), + topInset + box.minHeight(-1) + bottomInset); + } + + /** {@inheritDoc} */ + @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { + return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.prefWidth(-1)); + } + + /** {@inheritDoc} */ + @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { + return Math.max(super.computePrefHeight(width - box.prefWidth(-1), topInset, rightInset, bottomInset, leftInset), + topInset + box.prefHeight(-1) + bottomInset); + } + + /** {@inheritDoc} */ + @Override protected void layoutChildren(final double x, final double y, + final double w, final double h) { + final CheckBox checkBox = getSkinnable(); + final double boxWidth = snapSize(box.prefWidth(-1)); + final double boxHeight = snapSize(box.prefHeight(-1)); + final double computeWidth = Math.max(checkBox.prefWidth(-1), checkBox.minWidth(-1)); + final double labelWidth = Math.min( computeWidth - boxWidth, w - snapSize(boxWidth)); + final double labelHeight = Math.min(checkBox.prefHeight(labelWidth), h); + final double maxHeight = Math.max(boxHeight, labelHeight); + final double xOffset = Utils.computeXOffset(w, labelWidth + boxWidth, checkBox.getAlignment().getHpos()) + x; + final double yOffset = Utils.computeYOffset(h, maxHeight, checkBox.getAlignment().getVpos()) + x; + + layoutLabelInArea(xOffset + boxWidth, yOffset, labelWidth, maxHeight, checkBox.getAlignment()); + box.resize(boxWidth, boxHeight); + positionInArea(box, xOffset, yOffset, boxWidth, maxHeight, 0, checkBox.getAlignment().getHpos(), checkBox.getAlignment().getVpos()); + } +}