GWIN fixes

1 files changed, 61 insertions, 51 deletions

diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index 7845ba69..2102d3a2 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -1,22 +1,29 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * 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.
+ */
 
 #include "gfx.h"
 
@@ -31,7 +38,7 @@ static GHandle		ghCheckbox1, ghCheckbox2;
 
 #define BUTTON_WIDTH	50
 #define BUTTON_HEIGHT	30
-#define SLIDER_WIDTH	10
+#define SLIDER_WIDTH	20
 #define CHECKBOX_WIDTH	80
 #define CHECKBOX_HEIGHT	20
 
@@ -42,48 +49,51 @@ int main(void) {
 	gfxInit();
 	gdispClear(White);
 
-	// Set the font
+	// Set the font and defalt colors
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
+	gwinSetDefaultColor(Black);
+	gwinSetDefaultBgColor(White);
 
 	// Create out gwin windows/widgets
+	ghConsole = gwinCreateConsole(NULL, ScrWidth/2+1, ScrHeight/2+1, ScrWidth/2-1, ScrHeight/2-1);
 	ghButton1 = gwinCreateButton(NULL, 0+0*(BUTTON_WIDTH+1), 0, BUTTON_WIDTH, BUTTON_HEIGHT);
 	ghButton2 = gwinCreateButton(NULL, 0+1*(BUTTON_WIDTH+1), 0, BUTTON_WIDTH, BUTTON_HEIGHT);
 	ghButton3 = gwinCreateButton(NULL, 0+2*(BUTTON_WIDTH+1), 0, BUTTON_WIDTH, BUTTON_HEIGHT);
 	ghButton4 = gwinCreateButton(NULL, 0+3*(BUTTON_WIDTH+1), 0, BUTTON_WIDTH, BUTTON_HEIGHT);
-	ghConsole = gwinCreateConsole(NULL, ScrWidth/2+1, ScrHeight/2+1, ScrWidth/2-1, ScrHeight/2-1);
 	ghSlider1 = gwinCreateSlider(NULL, ScrWidth/2+1, ScrHeight/2-2*(SLIDER_WIDTH+1), ScrWidth/2-2, SLIDER_WIDTH);
 	ghSlider2 = gwinCreateSlider(NULL, ScrWidth/2+1, ScrHeight/2-1*(SLIDER_WIDTH+1), ScrWidth/2-2, SLIDER_WIDTH);
-	ghSlider3 = gwinCreateSlider(NULL, 0+1*(SLIDER_WIDTH+1), ScrHeight/2+1, SLIDER_WIDTH, ScrHeight/2-2);
+	ghSlider3 = gwinCreateSlider(NULL, 0+0*(SLIDER_WIDTH+1), ScrHeight/2+1, SLIDER_WIDTH, ScrHeight/2-2);
 	ghSlider4 = gwinCreateSlider(NULL, 0+1*(SLIDER_WIDTH+1), ScrHeight/2+1, SLIDER_WIDTH, ScrHeight/2-2);
 	ghCheckbox1 = gwinCreateCheckbox(NULL, 0, BUTTON_HEIGHT+1, CHECKBOX_WIDTH, CHECKBOX_HEIGHT);
 	ghCheckbox2 = gwinCreateCheckbox(NULL, 0, BUTTON_HEIGHT+1+1*(CHECKBOX_HEIGHT+1), CHECKBOX_WIDTH, CHECKBOX_HEIGHT);
 
-	// Color everything
+	// Color everything and set special drawing for some widgets
     gwinSetColor(ghConsole, Yellow);
     gwinSetBgColor(ghConsole, Black);
+    gwinSetCustomDraw(ghCheckbox2, gwinCheckboxDraw_CheckOnRight, 0);
 
     // Set the text on all the controls
     gwinSetText(ghButton1, "B1", FALSE);
-    gwinSetText(ghButton2, "B2", FALSE);
-    gwinSetText(ghButton3, "B3", FALSE);
-    gwinSetText(ghButton4, "B4", FALSE);
-    gwinSetText(ghSlider1, "S1", FALSE);
-    gwinSetText(ghSlider2, "S2", FALSE);
-    gwinSetText(ghSlider3, "S3", FALSE);
-    gwinSetText(ghSlider4, "S4", FALSE);
-    gwinSetText(ghCheckbox1, "C1", FALSE);
-    gwinSetText(ghCheckbox2, "C2", FALSE);
+	gwinSetText(ghButton2, "B2", FALSE);
+	gwinSetText(ghButton3, "B3", FALSE);
+	gwinSetText(ghButton4, "B4", FALSE);
+	gwinSetText(ghSlider1, "S1", FALSE);
+	gwinSetText(ghSlider2, "S2", FALSE);
+	gwinSetText(ghSlider3, "S3", FALSE);
+	gwinSetText(ghSlider4, "S4", FALSE);
+	gwinSetText(ghCheckbox1, "C1", FALSE);
+	gwinSetText(ghCheckbox2, "C2", FALSE);
 
     // Assign the mouse and dials to the buttons & sliders etc.
 #if GINPUT_NEED_MOUSE
-	gwinAttachMouse(ghSlider1, 0);
-	gwinAttachMouse(ghSlider2, 0);
-	gwinAttachMouse(ghSlider3, 0);
-	gwinAttachMouse(ghSlider4, 0);
 	gwinAttachMouse(ghButton1, 0);
 	gwinAttachMouse(ghButton2, 0);
 	gwinAttachMouse(ghButton3, 0);
 	gwinAttachMouse(ghButton4, 0);
+	gwinAttachMouse(ghSlider1, 0);
+	gwinAttachMouse(ghSlider2, 0);
+	gwinAttachMouse(ghSlider3, 0);
+	gwinAttachMouse(ghSlider4, 0);
 	gwinAttachMouse(ghCheckbox1, 0);
 	gwinAttachMouse(ghCheckbox2, 0);
 #endif
@@ -94,29 +104,29 @@ int main(void) {
 
     // We want to listen for widget events
 	geventListenerInit(&gl);
-	gwinAttachListener(ghSlider1, &gl, 0);
-	gwinAttachListener(ghSlider2, &gl, 0);
-	gwinAttachListener(ghSlider3, &gl, 0);
-	gwinAttachListener(ghSlider4, &gl, 0);
 	gwinAttachListener(ghButton1, &gl, 0);
 	gwinAttachListener(ghButton2, &gl, 0);
 	gwinAttachListener(ghButton3, &gl, 0);
 	gwinAttachListener(ghButton4, &gl, 0);
+	gwinAttachListener(ghSlider1, &gl, 0);
+	gwinAttachListener(ghSlider2, &gl, 0);
+	gwinAttachListener(ghSlider3, &gl, 0);
+	gwinAttachListener(ghSlider4, &gl, 0);
 	gwinAttachListener(ghCheckbox1, &gl, 0);
 	gwinAttachListener(ghCheckbox2, &gl, 0);
 
 	// Draw everything on the screen
-    gwinClear(ghConsole);
-    gwinDraw(ghSlider1);
-    gwinDraw(ghSlider2);
-    gwinDraw(ghSlider3);
-    gwinDraw(ghSlider4);
-    gwinDraw(ghButton1);
-    gwinDraw(ghButton2);
-    gwinDraw(ghButton3);
-    gwinDraw(ghButton4);
-    gwinDraw(ghCheckbox1);
-    gwinDraw(ghCheckbox2);
+	gwinClear(ghConsole);
+	gwinDraw(ghButton1);
+	gwinDraw(ghButton2);
+	gwinDraw(ghButton3);
+	gwinDraw(ghButton4);
+	gwinDraw(ghSlider1);
+	gwinDraw(ghSlider2);
+	gwinDraw(ghSlider3);
+	gwinDraw(ghSlider4);
+	gwinDraw(ghCheckbox1);
+	gwinDraw(ghCheckbox2);
 
 	while(1) {
 		// Get an Event