diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-01-23 17:57:13 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-01-23 17:57:13 +1000 |
| commit | b316263833c95cf2b8cf14fe890321d5880aa81c (patch) | |
| tree | 45ed1a3919a4bf05d4de4786aba476bd6a25aec8 /demos | |
| parent | fa8167b94d13e94a6cb953e7f549a89f155f77c6 (diff) | |
| download | uGFX-b316263833c95cf2b8cf14fe890321d5880aa81c.tar.gz uGFX-b316263833c95cf2b8cf14fe890321d5880aa81c.tar.bz2 uGFX-b316263833c95cf2b8cf14fe890321d5880aa81c.zip | |
Implement a "Toggle Button" using a checkbox with a custom draw.
Updated the widgets demo to show this.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index ea3dbfba..80cd6c02 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -87,7 +87,7 @@ static GHandle ghConsole; static GHandle ghPgButtons, ghPgSliders, ghPgCheckboxes, ghPgLabels, ghPgRadios, ghPgLists, ghPgImages, ghPgProgressbars; static GHandle ghButton1, ghButton2, ghButton3, ghButton4; static GHandle ghSlider1, ghSlider2, ghSlider3, ghSlider4; -static GHandle ghCheckbox1, ghCheckbox2, ghCheckDisableAll; +static GHandle ghCheckbox1, ghCheckbox2, ghCheckbox3, ghCheckDisableAll; static GHandle ghLabelSlider1, ghLabelSlider2, ghLabelSlider3, ghLabelSlider4, ghLabelRadio1; static GHandle ghRadio1, ghRadio2; static GHandle ghRadioBlack, ghRadioWhite, ghRadioYellow; @@ -303,7 +303,7 @@ static void createWidgets(void) { ghSlider4 = gwinSliderCreate(0, &wi); gwinSliderSetPosition(ghSlider4, 76); - // Checkboxes - for the 2nd checkbox we apply special drawing before making it visible + // Checkboxes - for the 2nd and 3rd checkbox we apply special drawing before making it visible wi.g.parent = ghPgCheckboxes; wi.g.width = CHECKBOX_WIDTH; wi.g.height = CHECKBOX_HEIGHT; wi.g.x = 5; wi.g.y = 5; wi.text = "C1"; @@ -311,8 +311,11 @@ static void createWidgets(void) { wi.customDraw = gwinCheckboxDraw_CheckOnRight; wi.g.y += wi.g.height+1; wi.text = "C2"; ghCheckbox2 = gwinCheckboxCreate(0, &wi); - wi.customDraw = 0; wi.g.width = DISABLEALL_WIDTH; + wi.customDraw = gwinCheckboxDraw_Button; + wi.g.y += wi.g.height+1; wi.text = "C3"; wi.g.width = BUTTON_WIDTH; wi.g.height = BUTTON_HEIGHT; + ghCheckbox3 = gwinCheckboxCreate(0, &wi); wi.g.y += wi.g.height+1; wi.text = "Disable All"; + wi.customDraw = 0; wi.g.width = DISABLEALL_WIDTH; wi.g.height = CHECKBOX_HEIGHT; ghCheckDisableAll = gwinCheckboxCreate(0, &wi); // Labels @@ -478,6 +481,7 @@ static void setEnabled(bool_t ena) { // Checkboxes we need to do individually so we don't disable the checkbox to re-enable everything gwinSetEnabled(ghCheckbox1, ena); gwinSetEnabled(ghCheckbox2, ena); + gwinSetEnabled(ghCheckbox3, ena); //gwinSetEnabled(ghCheckDisableAll, TRUE); } |