--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ListCellSkin.java 2015-09-03 15:19:53.068234200 -0700 +++ /dev/null 2015-09-03 15:19:54.000000000 -0700 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2010, 2014, 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.geometry.Orientation; -import javafx.scene.control.ListCell; -import javafx.scene.control.ListView; - -import com.sun.javafx.scene.control.behavior.ListCellBehavior; - -public class ListCellSkin extends CellSkinBase, ListCellBehavior> { - - private double fixedCellSize; - private boolean fixedCellSizeEnabled; - - public ListCellSkin(ListCell control) { - super(control, new ListCellBehavior(control)); - - this.fixedCellSize = control.getListView().getFixedCellSize(); - this.fixedCellSizeEnabled = fixedCellSize > 0; - - registerChangeListener(control.getListView().fixedCellSizeProperty(), "FIXED_CELL_SIZE"); - } - - @Override protected void handleControlPropertyChanged(String p) { - super.handleControlPropertyChanged(p); - if ("FIXED_CELL_SIZE".equals(p)) { - this.fixedCellSize = getSkinnable().getListView().getFixedCellSize(); - this.fixedCellSizeEnabled = fixedCellSize > 0; - } - } - - @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { - double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset); - ListView listView = getSkinnable().getListView(); - return listView == null ? 0 : - listView.getOrientation() == Orientation.VERTICAL ? pref : Math.max(pref, getCellSize()); - } - - @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { - if (fixedCellSizeEnabled) { - return fixedCellSize; - } - - // Added the comparison between the default cell size and the requested - // cell size to prevent the issue identified in RT-19873. - final double cellSize = getCellSize(); - final double prefHeight = cellSize == DEFAULT_CELL_SIZE ? super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset) : cellSize; - return prefHeight; - } - - @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { - if (fixedCellSizeEnabled) { - return fixedCellSize; - } - - return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset); - } - - @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { - if (fixedCellSizeEnabled) { - return fixedCellSize; - } - - return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset); - } -} --- /dev/null 2015-09-03 15:19:54.000000000 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/skin/ListCellSkin.java 2015-09-03 15:19:52.367194100 -0700 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2010, 2014, 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 javafx.geometry.Orientation; +import javafx.scene.Node; +import javafx.scene.control.Accordion; +import javafx.scene.control.Button; +import javafx.scene.control.Control; +import javafx.scene.control.ListCell; +import javafx.scene.control.ListView; + +import com.sun.javafx.scene.control.behavior.ListCellBehavior; + +/** + * Default skin implementation for the {@link ListCell} control. + * + * @see ListCell + * @since 9 + */ +public class ListCellSkin extends CellSkinBase> { + + /*************************************************************************** + * * + * Private fields * + * * + **************************************************************************/ + + private double fixedCellSize; + private boolean fixedCellSizeEnabled; + private final BehaviorBase> behavior; + + + + /*************************************************************************** + * * + * Constructors * + * * + **************************************************************************/ + + /** + * Creates a new ListCellSkin 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 ListCellSkin(ListCell control) { + super(control); + + // install default input map for the ListCell control + behavior = new ListCellBehavior<>(control); +// control.setInputMap(behavior.getInputMap()); + + this.fixedCellSize = control.getListView().getFixedCellSize(); + this.fixedCellSizeEnabled = fixedCellSize > 0; + + registerChangeListener(control.getListView().fixedCellSizeProperty(), e -> { + this.fixedCellSize = getSkinnable().getListView().getFixedCellSize(); + this.fixedCellSizeEnabled = fixedCellSize > 0; + }); + } + + + + /*************************************************************************** + * * + * Public API * + * * + **************************************************************************/ + + /** {@inheritDoc} */ + @Override public void dispose() { + super.dispose(); + + if (behavior != null) { + behavior.dispose(); + } + } + + /** {@inheritDoc} */ + @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) { + double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset); + ListView listView = getSkinnable().getListView(); + return listView == null ? 0 : + listView.getOrientation() == Orientation.VERTICAL ? pref : Math.max(pref, getCellSize()); + } + + /** {@inheritDoc} */ + @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { + if (fixedCellSizeEnabled) { + return fixedCellSize; + } + + // Added the comparison between the default cell size and the requested + // cell size to prevent the issue identified in RT-19873. + final double cellSize = getCellSize(); + final double prefHeight = cellSize == DEFAULT_CELL_SIZE ? super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset) : cellSize; + return prefHeight; + } + + /** {@inheritDoc} */ + @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { + if (fixedCellSizeEnabled) { + return fixedCellSize; + } + + return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset); + } + + /** {@inheritDoc} */ + @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) { + if (fixedCellSizeEnabled) { + return fixedCellSize; + } + + return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset); + } +}