Permalink
Browse files

Some minor fixes

  • Loading branch information...
1 parent af83e26 commit faccb9094471c12217ce769575a2db00a6d60d0a @HanSolo committed Nov 17, 2016
View
@@ -12,3 +12,4 @@ otherResources
._*
.gradle
.DS_Store
+/out
@@ -933,7 +933,8 @@ public void setRunning(boolean RUNNING) {
}
}
public BooleanProperty runningProperty() {
- if (null == running) { new BooleanPropertyBase(_running) {
+ if (null == running) {
+ running = new BooleanPropertyBase(_running) {
@Override protected void invalidated() {
if (get() && !isAnimated()) { scheduleTickTask(); } else { stopTask(periodicTickTask); }
}
@@ -2123,6 +2124,7 @@ public void setSkinType(ClockSkinType SKIN) {
setSecondColor(Color.WHITE);
setDateColor(Color.WHITE);
super.setSkin(new SlimClockSkin(Clock.this));
+ break;
case MINIMAL:
setBackgroundPaint(Color.rgb(255, 255, 255, 0.3));
setMinuteColor(Color.rgb(59, 209, 255));
@@ -4107,7 +4107,7 @@ public void setTickMarkSectionsVisible(final boolean VISIBLE) {
tickMarkSectionsVisible.set(VISIBLE);
}
}
- public BooleanProperty TickMarkSectionsVisibleProperty() {
+ public BooleanProperty tickMarkSectionsVisibleProperty() {
if (null == tickMarkSectionsVisible) {
tickMarkSectionsVisible = new BooleanPropertyBase(_tickMarkSectionsVisible) {
@Override protected void invalidated() { fireUpdateEvent(REDRAW_EVENT); }
@@ -4139,7 +4139,7 @@ public void setTickLabelSectionsVisible(final boolean VISIBLE) {
tickLabelSectionsVisible.set(VISIBLE);
}
}
- public BooleanProperty TickLabelSectionsVisibleProperty() {
+ public BooleanProperty tickLabelSectionsVisibleProperty() {
if (null == tickLabelSectionsVisible) {
tickLabelSectionsVisible = new BooleanPropertyBase(_tickLabelSectionsVisible) {
@Override protected void invalidated() { fireUpdateEvent(REDRAW_EVENT); }
@@ -4326,7 +4326,7 @@ public void setMinorTickMarksVisible(final boolean VISIBLE) {
minorTickMarksVisible.set(VISIBLE);
}
}
- public BooleanProperty MinorTickMarksVisibleProperty() {
+ public BooleanProperty minorTickMarksVisibleProperty() {
if (null == minorTickMarksVisible) {
minorTickMarksVisible = new BooleanPropertyBase(_minorTickMarksVisible) {
@Override protected void invalidated() { fireUpdateEvent(REDRAW_EVENT); }
@@ -63,10 +63,10 @@
private static final double MINIMUM_HEIGHT = 33;
private static final double MAXIMUM_WIDTH = 918;
private static final double MAXIMUM_HEIGHT = 198;
+ private static double aspectRatio = PREFERRED_HEIGHT / PREFERRED_WIDTH;
private Region[] bars;
private Background[] barBackgrounds;
private Border barBorder;
- private static double aspectRatio;
private double width;
private double height;
private HBox pane;
@@ -78,7 +78,6 @@
// ******************** Constructors **************************************
public ChargeSkin(Gauge gauge) {
super(gauge);
- aspectRatio = PREFERRED_HEIGHT / PREFERRED_WIDTH;
backgroundPaint = Color.TRANSPARENT;
borderPaint = Color.TRANSPARENT;
borderWidth = 0;
@@ -558,7 +558,7 @@ private void drawTickMarks(final GraphicsContext CTX) {
double textPointX;
double textPointY;
- double orthTextFactor = TickLabelOrientation.ORTHOGONAL == getSkinnable().getTickLabelOrientation() ? 0.46 : 0.46;
+ double orthTextFactor = 0.46; //TickLabelOrientation.ORTHOGONAL == getSkinnable().getTickLabelOrientation() ? 0.46 : 0.46;
Font tickLabelFont = Fonts.robotoCondensedLight((decimals == 0 ? 0.047 : 0.040) * size);
CTX.setFont(tickLabelFont);
@@ -485,7 +485,7 @@ private void drawTickMarks() {
double orthTextFactor;
if (TickLabelLocation.OUTSIDE == tickLabelLocation) {
- orthTextFactor = TickLabelOrientation.ORTHOGONAL == tickLabelOrientation ? 0.45 * textDisplacementFactor : 0.45 * textDisplacementFactor;
+ orthTextFactor = 0.45 * textDisplacementFactor;// TickLabelOrientation.ORTHOGONAL == tickLabelOrientation ? 0.45 * textDisplacementFactor : 0.45 * textDisplacementFactor;
majorDotSize = 0.02 * size;
majorHalfDotSize = majorDotSize * 0.5;
mediumDotSize = 0.01375 * size;
@@ -388,7 +388,7 @@ public static void drawRadialTickMarks(final Gauge GAUGE, final GraphicsContext
double orthTextFactor;
if (TickLabelLocation.OUTSIDE == tickLabelLocation) {
- orthTextFactor = TickLabelOrientation.ORTHOGONAL == tickLabelOrientation ? 0.45 * textDisplacementFactor : 0.45 * textDisplacementFactor;
+ orthTextFactor = 0.45 * textDisplacementFactor;//TickLabelOrientation.ORTHOGONAL == tickLabelOrientation ? 0.45 * textDisplacementFactor : 0.45 * textDisplacementFactor;
majorDotSize = 0.02 * SIZE;
majorHalfDotSize = majorDotSize * 0.5;
mediumDotSize = 0.01375 * SIZE;

0 comments on commit faccb90

Please sign in to comment.