2.2.3 release

sojamo · Mar 24, 2015 · 388b135 · 388b135
1 parent e2b6800
commit 388b135
Show file tree

Hide file tree

Showing 48 changed files with 125 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,3 @@
 .buildpath
 .classpath
 .project
-
diff --git a/README.md b/README.md
@@ -366,4 +366,4 @@ If you want to help improve ControlP5, the first place for me to do so would be
 
 If you have used ControlP5 in any of your projects, let me know, send me details, send me links, send me screeshots.
 
-Copyright 2006-2014 Andreas Schlegel
+Copyright 2006-2015 Andreas Schlegel
diff --git a/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde b/examples/controllers/ControlP5ButtonBar/ControlP5ButtonBar.pde
@@ -200,7 +200,7 @@ controlP5.Controller : void setView(ControllerView, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:39
+created: 2015/03/24 12:20:51
 
 */
 

diff --git a/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde b/examples/controllers/ControlP5ColorWheel/ControlP5ColorWheel.pde
@@ -196,7 +196,7 @@ controlP5.Controller : void setView(ControllerView, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:40
+created: 2015/03/24 12:21:00
 
 */
 

diff --git a/examples/controllers/ControlP5accordion/ControlP5accordion.pde b/examples/controllers/ControlP5accordion/ControlP5accordion.pde
@@ -279,7 +279,7 @@ controlP5.ControllerGroup : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:42
+created: 2015/03/24 12:25:32
 
 */
 

diff --git a/examples/controllers/ControlP5background/ControlP5background.pde b/examples/controllers/ControlP5background/ControlP5background.pde
@@ -181,7 +181,7 @@ controlP5.ControllerGroup : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:44
+created: 2015/03/24 12:25:35
 
 */
 

diff --git a/examples/controllers/ControlP5bang/ControlP5bang.pde b/examples/controllers/ControlP5bang/ControlP5bang.pde
@@ -224,7 +224,7 @@ controlP5.Controller : void setView(ControllerView, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:45
+created: 2015/03/24 12:25:36
 
 */
 

diff --git a/examples/controllers/ControlP5button/ControlP5button.pde b/examples/controllers/ControlP5button/ControlP5button.pde
@@ -260,7 +260,7 @@ controlP5.Controller : void setView(ControllerView, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:47
+created: 2015/03/24 12:20:49
 
 */
 

diff --git a/examples/controllers/ControlP5canvas/ControlP5canvas.pde b/examples/controllers/ControlP5canvas/ControlP5canvas.pde
@@ -82,7 +82,7 @@ controlP5.Canvas : void update(PApplet)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:48
+created: 2015/03/24 12:20:53
 
 */
 

diff --git a/examples/controllers/ControlP5chart/ControlP5chart.pde b/examples/controllers/ControlP5chart/ControlP5chart.pde
@@ -236,7 +236,7 @@ controlP5.Controller : void setView(ControllerView, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:50
+created: 2015/03/24 12:20:54
 
 */
 

diff --git a/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde b/examples/controllers/ControlP5checkBox/ControlP5checkBox.pde
@@ -235,7 +235,7 @@ controlP5.ControllerGroup : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:51
+created: 2015/03/24 12:20:56
 
 */
 

diff --git a/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde b/examples/controllers/ControlP5colorPicker/ControlP5colorPicker.pde
@@ -181,7 +181,7 @@ controlP5.ControllerGroup : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:53
+created: 2015/03/24 12:20:58
 
 */
 

diff --git a/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde b/examples/controllers/ControlP5controlTimer/ControlP5controlTimer.pde
@@ -56,7 +56,7 @@ controlP5.ControlTimer : void update()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:55
+created: 2015/03/24 12:21:02
 
 */
 

diff --git a/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde b/examples/controllers/ControlP5controllerProperties/ControlP5controllerProperties.pde
@@ -158,7 +158,7 @@ controlP5.ControllerProperties : void setFormat(String)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:56
+created: 2015/03/24 12:21:03
 
 */
 

diff --git a/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde b/examples/controllers/ControlP5dropdownList/ControlP5dropdownList.pde
@@ -304,7 +304,7 @@ controlP5.DropdownList : void updateItemIndexOffset()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:18:58
+created: 2015/03/24 12:21:05
 
 */
 

diff --git a/examples/controllers/ControlP5group/ControlP5group.pde b/examples/controllers/ControlP5group/ControlP5group.pde
@@ -228,7 +228,7 @@ controlP5.ControllerGroup : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:00
+created: 2015/03/24 12:21:07
 
 */
 

diff --git a/examples/controllers/ControlP5icon/ControlP5icon.pde b/examples/controllers/ControlP5icon/ControlP5icon.pde
@@ -211,7 +211,7 @@ controlP5.Icon : int getFontIcon(int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:01
+created: 2015/03/24 12:21:09
 
 */
 

diff --git a/examples/controllers/ControlP5knob/ControlP5knob.pde b/examples/controllers/ControlP5knob/ControlP5knob.pde
@@ -253,7 +253,7 @@ controlP5.Knob : int getViewStyle()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:02
+created: 2015/03/24 12:21:10
 
 */
 

diff --git a/examples/controllers/ControlP5listBox/ControlP5listBox.pde b/examples/controllers/ControlP5listBox/ControlP5listBox.pde
@@ -312,7 +312,7 @@ controlP5.ListBox : void updateItemIndexOffset()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:04
+created: 2015/03/24 12:21:12
 
 */
 

diff --git a/examples/controllers/ControlP5matrix/ControlP5matrix.pde b/examples/controllers/ControlP5matrix/ControlP5matrix.pde
@@ -289,7 +289,7 @@ controlP5.Matrix : void remove()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:06
+created: 2015/03/24 12:21:14
 
 */
 

diff --git a/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde b/examples/controllers/ControlP5numberbox/ControlP5numberbox.pde
@@ -207,7 +207,7 @@ controlP5.Numberbox : float getMultiplier()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:09
+created: 2015/03/24 12:25:44
 
 */
 

diff --git a/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde b/examples/controllers/ControlP5radioButton/ControlP5radioButton.pde
@@ -231,7 +231,7 @@ controlP5.RadioButton : void updateLayout()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:11
+created: 2015/03/24 12:21:19
 
 */
 

diff --git a/examples/controllers/ControlP5range/ControlP5range.pde b/examples/controllers/ControlP5range/ControlP5range.pde
@@ -237,7 +237,7 @@ controlP5.Range : float[] getArrayValue()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:12
+created: 2015/03/24 12:21:20
 
 */
 

diff --git a/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde b/examples/controllers/ControlP5scrollableList/ControlP5scrollableList.pde
@@ -254,7 +254,7 @@ controlP5.ScrollableList : void updateItemIndexOffset()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:14
+created: 2015/03/24 12:21:22
 
 */
 

diff --git a/examples/controllers/ControlP5slider/ControlP5slider.pde b/examples/controllers/ControlP5slider/ControlP5slider.pde
@@ -290,7 +290,7 @@ controlP5.Slider : int getTriggerEvent()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:16
+created: 2015/03/24 12:25:46
 
 */
 

diff --git a/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde b/examples/controllers/ControlP5slider2D/ControlP5slider2D.pde
@@ -231,7 +231,7 @@ controlP5.Slider2D : void setValueLabelSeparator(String)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:18
+created: 2015/03/24 12:25:47
 
 */
 

diff --git a/examples/controllers/ControlP5tab/ControlP5tab.pde b/examples/controllers/ControlP5tab/ControlP5tab.pde
@@ -229,7 +229,7 @@ controlP5.Tab : float getValue()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:19
+created: 2015/03/24 12:25:49
 
 */
 

diff --git a/examples/controllers/ControlP5textarea/ControlP5textarea.pde b/examples/controllers/ControlP5textarea/ControlP5textarea.pde
@@ -222,7 +222,7 @@ controlP5.Textarea : void controlEvent(ControlEvent)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:21
+created: 2015/03/24 12:21:29
 
 */
 

diff --git a/examples/controllers/ControlP5textfield/ControlP5textfield.pde b/examples/controllers/ControlP5textfield/ControlP5textfield.pde
@@ -250,7 +250,7 @@ controlP5.Textfield : void keyEvent(KeyEvent)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:23
+created: 2015/03/24 12:21:31
 
 */
 

diff --git a/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde b/examples/controllers/ControlP5textlabel/ControlP5Textlabel.pde
@@ -204,7 +204,7 @@ controlP5.Textlabel : void draw(int, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:24
+created: 2015/03/24 12:21:33
 
 */
 

diff --git a/examples/controllers/ControlP5toggle/ControlP5toggle.pde b/examples/controllers/ControlP5toggle/ControlP5toggle.pde
@@ -228,10 +228,11 @@ controlP5.Toggle : Toggle toggle()
 controlP5.Toggle : Toggle update() 
 controlP5.Toggle : boolean getBooleanValue() 
 controlP5.Toggle : boolean getState() 
+controlP5.Toggle : int getMode() 
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:26
+created: 2015/03/24 12:21:35
 
 */
 

diff --git a/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde b/examples/controllers/ControlP5tooltip/ControlP5tooltip.pde
@@ -109,7 +109,7 @@ controlP5.Tooltip : int getWidth()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:27
+created: 2015/03/24 12:21:36
 
 */
 

diff --git a/examples/extra/ControlP5frameRate/ControlP5frameRate.pde b/examples/extra/ControlP5frameRate/ControlP5frameRate.pde
@@ -192,7 +192,7 @@ controlP5.Textlabel : void draw(int, int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:19:51
+created: 2015/03/24 12:22:02
 
 */
 

diff --git a/examples/extra/ControlP5pointer/ControlP5pointer.pde b/examples/extra/ControlP5pointer/ControlP5pointer.pde
@@ -68,7 +68,7 @@ ClassName : returnType methodName(parameter type)
 
 
 
-created: 2014/09/08 01:20:02
+created: 2015/03/24 12:22:14
 
 */
 

diff --git a/examples/use/ControlP5controlEvent/ControlP5controlEvent.pde b/examples/use/ControlP5controlEvent/ControlP5controlEvent.pde
@@ -112,7 +112,7 @@ controlP5.ControlEvent : int getType()
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:20:21
+created: 2015/03/24 12:22:35
 
 */
 

diff --git a/examples/use/ControlP5controlFont/ControlP5controlFont.pde b/examples/use/ControlP5controlFont/ControlP5controlFont.pde
@@ -127,7 +127,7 @@ controlP5.ControlFont : void setSize(int)
 java.lang.Object : String toString() 
 java.lang.Object : boolean equals(Object) 
 
-created: 2014/09/08 01:20:23
+created: 2015/03/24 12:22:36
 
 */
 

diff --git a/resources/build.xml b/resources/build.xml
@@ -13,13 +13,13 @@
 	</path>		
 	<property name="javaVersion"                value="1.6"/>
 	<property name="author"                     value="Andreas Schlegel"/>	
-	<property name="copyright"                  value="(c) 2006-2014"/>
+	<property name="copyright"                  value="(c) 2006-2015"/>
 	<property name="libraryName"                value="controlP5"/>
-	<property name="versionNumber"              value="2.2.2"/>
+	<property name="versionNumber"              value="2.2.3"/>
 	<property name="yourLink"                   value="http://www.sojamo.de" />
 	<property name="keywords"                   value="gui, ui, controller, interface, user interface" />
 	<property name="tested:platform"            value="osx, windows, linux" />
-	<property name="tested:processingVersion"  	value="2.2.1" />	
+	<property name="tested:processingVersion"  	value="2.2.3" />	
 	<property name="tested:dependencies"        value="none" />
 	<property name="source:host"                value="github" />
 	<property name="source:url"                 value="https://github.com/sojamo/controlp5" />

diff --git a/resources/library.properties b/resources/library.properties
@@ -22,7 +22,7 @@ category = GUI
 # shown from inside the PDE when the library is being installed. Avoid repeating
 # the name of your library here. Also, avoid saying anything redundant like
 # mentioning that its a library.
-sentence = A GUI library with a range of controllers to build custom user interfaces for desktop and android mode.
+sentence = A GUI library to build custom user interfaces for desktop and android mode.
 
 # Additional information suitable for the Processing website. The value of
 # 'sentence' always will be prepended, so you should start by writing the
@@ -38,7 +38,7 @@ paragraph = Includes interface elements such as slider, button, knob, toggle, te
 # is used to compare different versions of the same library, and
 # check if an update is available. You should think of it as a
 # counter, counting the total number of releases you've had.
-version = 81  # This must be parsable as an int
+version = 82  # This must be parsable as an int
 
 # The version as the user will see it. If blank, the version attribute will be used here
-prettyVersion = 2.2.2  # This is treated as a String
+prettyVersion = 2.2.3  # This is treated as a String
diff --git a/src/controlP5/CColor.java b/src/controlP5/CColor.java
@@ -34,33 +34,20 @@
 public class CColor implements Serializable {
 
 	private int colorBackground = 0xff003652;
-
 	private int colorForeground = 0xff00698c;
-
 	private int colorActive = 0xff08a2cf; // 0699C4;
-
 	private int colorCaptionLabel = 0xffffffff;
-
 	private int colorValueLabel = 0xffffffff;
-
 	private int colorBackgroundAlpha = 0xff;
-
 	private int colorForegroundAlpha = 0xff;
-
 	private int colorActiveAlpha = 0xff; // 0699C4;
-
 	private int colorCaptionLabelAlpha = 0xff;
-
 	private int colorValueLabelAlpha = 0xff;
 
 	private int alpha = 0xff;
-
 	private int maskA = 0x00ffffff;
-
 	int maskR = 0xff00ffff;
-
 	int maskG = 0xffff00ff;
-
 	int maskB = 0xffffff00;
 
 	protected CColor set( CColor theColor ) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -366,4 +366,4 @@ If you want to help improve ControlP5, the first place for me to do so would be

		If you have used ControlP5 in any of your projects, let me know, send me details, send me links, send me screeshots.

		Copyright 2006-2014 Andreas Schlegel
		Copyright 2006-2015 Andreas Schlegel
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,7 +68,7 @@ ClassName : returnType methodName(parameter type)



		created: 2014/09/08 01:20:02
		created: 2015/03/24 12:22:14

		*/

Expand Down