diff options
| author | Tectu <joel@unormal.org> | 2012-06-27 10:03:05 -0700 | 
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-06-27 10:03:05 -0700 | 
| commit | 1f43c6d654b9cbb86138c40e1f7f133d0bb5d214 (patch) | |
| tree | 781a53c2ba5ffa6b607db156f85bfc8544dcd371 /gui.c | |
| parent | 3a5be9c67812c2ef16f335078f2ec8e8773d2144 (diff) | |
| parent | bb69ed37aad36fac6bdf1e2c9669caee5689630f (diff) | |
| download | uGFX-1f43c6d654b9cbb86138c40e1f7f133d0bb5d214.tar.gz uGFX-1f43c6d654b9cbb86138c40e1f7f133d0bb5d214.tar.bz2 uGFX-1f43c6d654b9cbb86138c40e1f7f133d0bb5d214.zip  | |
Merge pull request #11 from trsaunders/master
Console support
Diffstat (limited to 'gui.c')
| -rw-r--r-- | gui.c | 4 | 
1 files changed, 2 insertions, 2 deletions
@@ -135,7 +135,7 @@ uint8_t guiDeleteElement(char *label) {  	return deleteElement(label);  } -uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *str, uint16_t fontColor, uint16_t buttonColor, uint16_t shadow, char *label, uint8_t *active, uint8_t *state) { +uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *str, font_t font, uint16_t fontColor, uint16_t buttonColor, uint16_t shadow, char *label, uint8_t *active, uint8_t *state) {  	struct guiNode_t *newNode;  	uint16_t i; @@ -156,7 +156,7 @@ uint8_t guiDrawButton(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, char *  	if(addElement(newNode) != 1)  		return 0; -	lcdDrawRectString(x0, y0, x1, y1, str, fontColor, buttonColor); +	lcdDrawRectString(x0, y0, x1, y1, str, font, fontColor, buttonColor);  	if(shadow != 0) {  		for(i = 0; i < shadow; i++) {  | 
