hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'designer-clear-toolbar' into designer-breadcrumbbar

Browse Source
This commit is contained in:
Clément Fournier
2019-01-14 00:24:00 +01:00
parent e46b0d4521 03ce9a3e48
commit a0b2fe5a27
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ToolbarTitledPane.java
View File

@@ -53,19 +53,19 @@ public final class ToolbarTitledPane extends TitledPane {
// centered unless we bind the height, like follows
Val.wrap(toolBar.parentProperty())
.values()
.filter(Objects::nonNull)
.subscribe(parent -> {
// The title region is provided by the skin,
// this is the only way to access it outside of css
StackPane titleRegion = (StackPane) parent;
toolBar.maxHeightProperty().unbind();
toolBar.maxHeightProperty().bind(titleRegion.heightProperty());
toolBar.minHeightProperty().unbind();
toolBar.minHeightProperty().bind(titleRegion.heightProperty());
toolBar.prefHeightProperty().unbind();
toolBar.prefHeightProperty().bind(titleRegion.heightProperty());
});
.values()
.filter(Objects::nonNull)
.subscribe(parent -> {
// The title region is provided by the skin,
// this is the only way to access it outside of css
StackPane titleRegion = (StackPane) parent;
toolBar.maxHeightProperty().unbind();
toolBar.maxHeightProperty().bind(titleRegion.heightProperty());
toolBar.minHeightProperty().unbind();
toolBar.minHeightProperty().bind(titleRegion.heightProperty());
toolBar.prefHeightProperty().unbind();
toolBar.prefHeightProperty().bind(titleRegion.heightProperty());
});
}

9
pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml
View File

@@ -32,21 +32,22 @@
<Menu fx:id="fileMenu" mnemonicParsing="false" text="File">
<items>
<MenuItem fx:id="openFileMenuItem" mnemonicParsing="false" text="Open..." />
<Menu fx:id="openRecentMenu" mnemonicParsing="false" text="Open recent..." />
<Menu fx:id="openRecentMenu" mnemonicParsing="false" text="Open recent" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Configuration">
<items>
<MenuItem fx:id="setupAuxclasspathMenuItem" mnemonicParsing="false" text="Set up the auxclasspath">
<MenuItem fx:id="setupAuxclasspathMenuItem" mnemonicParsing="false" text="Set up the auxclasspath...">
</MenuItem>
</items>
</Menu>
<Menu mnemonicParsing="false" text="About">
<items>
<MenuItem mnemonicParsing="false" text="About" />
<MenuItem fx:id="licenseMenuItem" mnemonicParsing="false" text="License" />
<!-- TODO add link to doc pages -->
<!--<MenuItem mnemonicParsing="false" text="About" />-->
<MenuItem fx:id="licenseMenuItem" mnemonicParsing="false" text="License..." />
</items>
</Menu>