From fd349ca95c1f3328fc410509774b6835f65f96ea Mon Sep 17 00:00:00 2001 From: hagna Date: Fri, 7 Feb 2020 17:13:04 -0700 Subject: [PATCH] Fix parameters and guess at constants (#70) --- .../image_raw_importer/image_raw_importer.c | 6 ++-- examples/scroll_panel/gui_scroll_panel.c | 32 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/image_raw_importer/image_raw_importer.c b/examples/image_raw_importer/image_raw_importer.c index 2a822cd..efc846c 100644 --- a/examples/image_raw_importer/image_raw_importer.c +++ b/examples/image_raw_importer/image_raw_importer.c @@ -190,10 +190,10 @@ int main() GuiLabel((Rectangle){ windowOffset.x + 85, windowOffset.y + 50, 75, 20 }, FormatText("%i bytes", dataSize)); GuiGroupBox((Rectangle){ windowOffset.x + 10, windowOffset.y + 85, 180, 80 }, "Resolution"); GuiLabel((Rectangle){ windowOffset.x + 20, windowOffset.y + 100, 33, 25 }, "Width:"); - if (GuiValueBox((Rectangle){ windowOffset.x + 60, windowOffset.y + 100, 80, 25 }, &widthValue, 0, 8192, widthEditMode)) widthEditMode = !widthEditMode; + if (GuiValueBox((Rectangle){ windowOffset.x + 60, windowOffset.y + 100, 80, 25 }, NULL, &widthValue, 0, 8192, widthEditMode)) widthEditMode = !widthEditMode; GuiLabel((Rectangle){ windowOffset.x + 145, windowOffset.y + 100, 30, 25 }, "pixels"); GuiLabel((Rectangle){ windowOffset.x + 20, windowOffset.y + 130, 33, 25 }, "Height:"); - if (GuiValueBox((Rectangle){ windowOffset.x + 60, windowOffset.y + 130, 80, 25 }, &heightValue, 0, 8192, heightEditMode)) heightEditMode = !heightEditMode; + if (GuiValueBox((Rectangle){ windowOffset.x + 60, windowOffset.y + 130, 80, 25 }, NULL, &heightValue, 0, 8192, heightEditMode)) heightEditMode = !heightEditMode; GuiLabel((Rectangle){ windowOffset.x + 145, windowOffset.y + 130, 30, 25 }, "pixels"); GuiGroupBox((Rectangle){ windowOffset.x + 10, windowOffset.y + 180, 180, 160 }, "Pixel Format"); pixelFormatActive = GuiComboBox((Rectangle){ windowOffset.x + 20, windowOffset.y + 195, 160, 25 }, TextJoin(pixelFormatTextList, 8, ";"), pixelFormatActive); @@ -208,7 +208,7 @@ int main() GuiGroupBox((Rectangle){ windowOffset.x + 10, windowOffset.y + 355, 180, 50 }, "Header"); GuiLabel((Rectangle){ windowOffset.x + 25, windowOffset.y + 370, 27, 25 }, "Size:"); - if (GuiValueBox((Rectangle){ windowOffset.x + 55, windowOffset.y + 370, 85, 25 }, &headerSizeValue, 0, 10000, headerSizeEditMode)) headerSizeEditMode = !headerSizeEditMode; + if (GuiValueBox((Rectangle){ windowOffset.x + 55, windowOffset.y + 370, 85, 25 }, NULL, &headerSizeValue, 0, 10000, headerSizeEditMode)) headerSizeEditMode = !headerSizeEditMode; GuiLabel((Rectangle){ windowOffset.x + 145, windowOffset.y + 370, 30, 25 }, "bytes"); btnLoadPressed = GuiButton((Rectangle){ windowOffset.x + 10, windowOffset.y + 420, 180, 30 }, "Import RAW"); diff --git a/examples/scroll_panel/gui_scroll_panel.c b/examples/scroll_panel/gui_scroll_panel.c index 3bfd929..3eb5dd4 100644 --- a/examples/scroll_panel/gui_scroll_panel.c +++ b/examples/scroll_panel/gui_scroll_panel.c @@ -78,8 +78,8 @@ int main() showContentArea = GuiCheckBox((Rectangle){ 565, 80, 20, 20 }, "SHOW CONTENT AREA", showContentArea); - panelContentRec.width = GuiSliderBar((Rectangle){ 590, 385, 145, 15}, "WIDTH", panelContentRec.width, 1, 600, true); - panelContentRec.height = GuiSliderBar((Rectangle){ 590, 410, 145, 15 }, "HEIGHT", panelContentRec.height, 1, 400, true); + panelContentRec.width = GuiSliderBar((Rectangle){ 590, 385, 145, 15}, "WIDTH", TextFormat("%i", (int)panelContentRec.width), 1, 600, true); + panelContentRec.height = GuiSliderBar((Rectangle){ 590, 410, 145, 15 }, "HEIGHT", TextFormat("%i", (int)panelContentRec.height), 1, 400, true); EndDrawing(); //---------------------------------------------------------------------------------- @@ -102,31 +102,31 @@ static void DrawStyleEditControls(void) int style = GuiGetStyle(SCROLLBAR, BORDER_WIDTH); GuiLabel((Rectangle){ 555, 195, 110, 10 }, "BORDER_WIDTH"); - GuiSpinner((Rectangle){ 670, 190, 90, 20 }, &style, 0, 6, false); + GuiSpinner((Rectangle){ 670, 190, 90, 20 }, NULL, &style, 0, 6, false); GuiSetStyle(SCROLLBAR, BORDER_WIDTH, style); style = GuiGetStyle(SCROLLBAR, ARROWS_SIZE); GuiLabel((Rectangle){ 555, 220, 110, 10 }, "ARROWS_SIZE"); - GuiSpinner((Rectangle){ 670, 215, 90, 20 }, &style, 4, 14, false); + GuiSpinner((Rectangle){ 670, 215, 90, 20 }, NULL, &style, 4, 14, false); GuiSetStyle(SCROLLBAR, ARROWS_SIZE, style); - style = GuiGetStyle(SCROLLBAR, INNER_PADDING); - GuiLabel((Rectangle){ 555, 245, 110, 10 }, "INNER_PADDING"); - GuiSpinner((Rectangle){ 670, 240, 90, 20 }, &style, 0, 14, false); - GuiSetStyle(SCROLLBAR, INNER_PADDING, style); + style = GuiGetStyle(SCROLLBAR, SLIDER_PADDING); + GuiLabel((Rectangle){ 555, 245, 110, 10 }, "SLIDER_PADDING"); + GuiSpinner((Rectangle){ 670, 240, 90, 20 }, NULL, &style, 0, 14, false); + GuiSetStyle(SCROLLBAR, SLIDER_PADDING, style); style = GuiCheckBox((Rectangle){ 565, 280, 20, 20 }, "ARROWS_VISIBLE", GuiGetStyle(SCROLLBAR, ARROWS_VISIBLE)); GuiSetStyle(SCROLLBAR, ARROWS_VISIBLE, style); style = GuiGetStyle(SCROLLBAR, SLIDER_PADDING); GuiLabel((Rectangle){ 555, 325, 110, 10 }, "SLIDER_PADDING"); - GuiSpinner((Rectangle){ 670, 320, 90, 20 }, &style, 0, 14, false); + GuiSpinner((Rectangle){ 670, 320, 90, 20 }, NULL, &style, 0, 14, false); GuiSetStyle(SCROLLBAR, SLIDER_PADDING, style); - style = GuiGetStyle(SCROLLBAR, SLIDER_SIZE); - GuiLabel((Rectangle){ 555, 350, 110, 10 }, "SLIDER_SIZE"); - GuiSpinner((Rectangle){ 670, 345, 90, 20 }, &style, 2, 100, false); - GuiSetStyle(SCROLLBAR, SLIDER_SIZE, style); + style = GuiGetStyle(SCROLLBAR, SLIDER_WIDTH); + GuiLabel((Rectangle){ 555, 350, 110, 10 }, "SLIDER_WIDTH"); + GuiSpinner((Rectangle){ 670, 345, 90, 20 }, NULL, &style, 2, 100, false); + GuiSetStyle(SCROLLBAR, SLIDER_WIDTH, style); const char *text = GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE) == SCROLLBAR_LEFT_SIDE? "SCROLLBAR: LEFT" : "SCROLLBAR: RIGHT"; style = GuiToggle((Rectangle){ 560, 110, 200, 35 }, text, GuiGetStyle(LISTVIEW, SCROLLBAR_SIDE)); @@ -139,12 +139,12 @@ static void DrawStyleEditControls(void) style = GuiGetStyle(LISTVIEW, SCROLLBAR_WIDTH); GuiLabel((Rectangle){ 555, 35, 110, 10 }, "SCROLLBAR_WIDTH"); - GuiSpinner((Rectangle){ 670, 30, 90, 20 }, &style, 6, 30, false); + GuiSpinner((Rectangle){ 670, 30, 90, 20 }, NULL, &style, 6, 30, false); GuiSetStyle(LISTVIEW, SCROLLBAR_WIDTH, style); style = GuiGetStyle(DEFAULT, BORDER_WIDTH); GuiLabel((Rectangle){ 555, 60, 110, 10 }, "BORDER_WIDTH"); - GuiSpinner((Rectangle){ 670, 55, 90, 20 }, &style, 0, 20, false); + GuiSpinner((Rectangle){ 670, 55, 90, 20 }, NULL, &style, 0, 20, false); GuiSetStyle(DEFAULT, BORDER_WIDTH, style); //---------------------------------------------------------- -} \ No newline at end of file +}