Skip to content

Commit

Permalink
Merge pull request #13 from Birdasaur/LitFX-0.0.4-Fixes
Browse files Browse the repository at this point in the history
Lit fx 0.0.4 fixes
  • Loading branch information
Birdasaur authored Sep 21, 2020
2 parents 7dfe31f + 65da7c8 commit ba0da5c
Show file tree
Hide file tree
Showing 31 changed files with 2,685 additions and 292 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
target/
.idea/
.idea/
*.iml
*/*.iml
90 changes: 90 additions & 0 deletions litfx-controls/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>LitFX</artifactId>
<groupId>com.github.birdasaur.litfx</groupId>
<version>0.0.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>litfx-controls</artifactId>

<properties>
<maven.compiler.source>14</maven.compiler.source>
<maven.compiler.target>14</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>com.github.birdasaur.litfx</groupId>
<artifactId>litfx-core</artifactId>
<version>0.0.5</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>${jfx.version}</version>
</dependency>
</dependencies>


<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/**
* Below is the original source code license header from the original version
* found in JFXtras Labs.
*
* RadialCheckMenuItem.java
*
* Copyright (c) 2011-2015, JFXtras
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the organization nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* adapted From Mr. LoNee's awesome RadialMenu example. Source for original
* prototype can be found in JFXtras-labs project.
* https://github.com/JFXtras/jfxtras-labs
*/
package lit.litfx.controls;

import javafx.scene.Node;
import javafx.scene.paint.Paint;

public class LitRadialCheckMenuItem extends LitRadialMenuItem {

protected boolean selected = false;
protected Paint selectedColor;
protected Paint selectedMouseOnColor;

public LitRadialCheckMenuItem(final double menuSize, final Node graphic) {
super(menuSize, graphic);
}

public LitRadialCheckMenuItem(final double menuSize, final Node graphic,
final boolean selected) {
this(menuSize, graphic);
this.selected = selected;
}

public LitRadialCheckMenuItem(final double menuSize, final Node graphic,
final boolean selected, final Paint selectedColor) {
this(menuSize, graphic, selected);
this.selectedColor = selectedColor;
}

public LitRadialCheckMenuItem(final double menuSize, final Node graphic,
final boolean selected, final Paint selectedColor,
final Paint selectedMouseOnColor) {
this(menuSize, graphic, selected);
this.selectedColor = selectedColor;
this.selectedMouseOnColor = selectedMouseOnColor;
}

@Override
protected void redraw() {
super.redraw();

Paint color = null;
if (backgroundVisible.get()) {
if (selected && selectedColor != null) {
if (mouseOn && selectedMouseOnColor != null) {
color = selectedMouseOnColor;
} else {
color = selectedColor;
}
} else {
if (mouseOn && backgroundMouseOnColor != null) {
color = backgroundMouseOnColor.get();
} else {
color = backgroundColor.get();
}
}
}

path.setFill(color);
}

@Override
void setSelected(final boolean selected) {
this.selected = selected;
redraw();
}

@Override
boolean isSelected() {
return this.selected;
}

}
Loading

0 comments on commit ba0da5c

Please sign in to comment.