From 752e1ac0a5d920cd4fcc7becdd1d1f0a0c615a6c Mon Sep 17 00:00:00 2001
From: ubi <me@ubidefeo.com>
Date: Thu, 15 Mar 2018 13:37:27 +0100
Subject: [PATCH] - removed reference to PApplet.setBounds(int, int, int, int)
 as it seems not to exist in Processing 3 anymore - added TickMark distance
 from component and fixed its relation to TickMark length

---
 src/controlP5/ControlWindow.java |  2 +-
 src/controlP5/TickMark.java      | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 src/controlP5/TickMark.java

diff --git a/src/controlP5/ControlWindow.java b/src/controlP5/ControlWindow.java
index 968d172..0ca169f 100755
--- a/src/controlP5/ControlWindow.java
+++ b/src/controlP5/ControlWindow.java
@@ -843,7 +843,7 @@ public final class ControlWindow {
 			_myApplet.frame.removeNotify( );
 			_myApplet.frame.setUndecorated( isUndecorated );
 			_myApplet.setSize( _myApplet.width , _myApplet.height );
-			_myApplet.setBounds( 0 , 0 , _myApplet.width , _myApplet.height );
+			//_myApplet.setBounds( 0 , 0 , _myApplet.width , _myApplet.height );
 			_myApplet.frame.setSize( _myApplet.width , _myApplet.height );
 			_myApplet.frame.addNotify( );
 		}
diff --git a/src/controlP5/TickMark.java b/src/controlP5/TickMark.java
old mode 100755
new mode 100644
index 2ff66fb..cdd7486
--- a/src/controlP5/TickMark.java
+++ b/src/controlP5/TickMark.java
@@ -20,8 +20,8 @@ package controlP5;
  * Boston, MA 02111-1307 USA
  * 
  * @author Andreas Schlegel (http://www.sojamo.de)
- * @modified ##date##
- * @version ##version##
+ * @modified 03/15/2018
+ * @version 2.2.6
  * 
  */
 import processing.core.PApplet;
@@ -35,6 +35,7 @@ public class TickMark implements CDrawable {
 	protected Controller< ? > _myParent;
 
 	protected int _myLen = 4;
+	protected int _myDistance = _myLen;
 
 	protected Label _myLabel;
 
@@ -52,14 +53,14 @@ public class TickMark implements CDrawable {
 		theGraphics.pushMatrix( );
 		switch ( theDirection ) {
 		case ( ControlP5Constants.HORIZONTAL ):
-			theGraphics.translate( 0 , _myLen );
+			theGraphics.translate( 0 , _myDistance );
 			theGraphics.rect( 0 , 0 , 1 , _myLen );
 			if ( isLabel ) {
 				_myLabel.draw( theGraphics , 0 , _myLen + 4 , _myParent );
 			}
 			break;
 		case ( ControlP5Constants.VERTICAL ):
-			theGraphics.translate( -_myLen , 0 );
+			theGraphics.translate( -_myDistance - _myLen , 0 );
 			theGraphics.rect( 0 , 0 , _myLen , 1 );
 			if ( isLabel ) {
 				_myLabel.draw( theGraphics , -_myLabel.getWidth( ) , 0 , _myParent );
@@ -74,6 +75,10 @@ public class TickMark implements CDrawable {
 		_myLen = theLength;
 	}
 
+	public void setDistance( int theDistance) {
+		_myDistance = theDistance;
+	}
+
 	public Label setLabel( String theLabeltext ) {
 		if ( _myLabel == null ) {
 			_myLabel = new Label( _myParent.cp5 , theLabeltext );