From f4c043f3024930ee6c26610797704c1a4aa41fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Mart=C3=ADnez?= Date: Tue, 23 Oct 2018 13:11:22 +0200 Subject: [PATCH] remove LOCKED state. Create guiLocked boolean. Improve FOCUSED state. --- examples/controls_review/controls_review.c | 10 +- .../controls_review/fonts/NorthernLights.ttf | Bin 0 -> 39136 bytes src/raygui.h | 197 ++++++++++-------- 3 files changed, 118 insertions(+), 89 deletions(-) create mode 100644 examples/controls_review/fonts/NorthernLights.ttf diff --git a/examples/controls_review/controls_review.c b/examples/controls_review/controls_review.c index 339cf35..78590b7 100644 --- a/examples/controls_review/controls_review.c +++ b/examples/controls_review/controls_review.c @@ -39,7 +39,7 @@ int main() int Spinner001Value = 0; int ValueBox002Value = 0; char TextBox003Text[64] = "SAMPLE TEXT"; - int ListView004Active = 1; + int ListView004Active = -1; const char *ListView004TextList[6] = { "Charmander", "Bulbasaur", "Squirtel", "Pikachu", "Eevee", "Pidgey" }; char TextBox006Text[141] = "SAMPLE TEXT"; @@ -54,7 +54,7 @@ int main() bool dropDown001EditMode = false; //---------------------------------------------------------------------------------- - Font font = LoadFontEx("fonts/pixelpoiiz10.ttf", 10, 0, 0); + Font font = LoadFontEx("fonts/NorthernLights.ttf", 30, 0, 0); GuiFont(font); SetTargetFPS(60); @@ -92,6 +92,12 @@ int main() if (GuiDropdownBox((Rectangle){ 25, 25, 125, 30 }, DropdownBox000TextList, 3, &DropdownBox000Active, dropDown000EditMode)) dropDown000EditMode = !dropDown000EditMode; + GuiLock(); + GuiState(0); if (GuiButton((Rectangle){ 25, 400, 125, 30 }, "SAMPLE TEXT")) Button005(); + GuiState(1); if (GuiButton((Rectangle){ 25, 440, 125, 30 }, "SAMPLE TEXT")) Button005(); + GuiState(2); if (GuiButton((Rectangle){ 25, 480, 125, 30 }, "SAMPLE TEXT")) Button005(); + GuiState(3); if (GuiButton((Rectangle){ 25, 520, 125, 30 }, "SAMPLE TEXT")) Button005(); + GuiState(1); GuiUnlock(); //---------------------------------------------------------------------------------- diff --git a/examples/controls_review/fonts/NorthernLights.ttf b/examples/controls_review/fonts/NorthernLights.ttf new file mode 100644 index 0000000000000000000000000000000000000000..55c82cd05992960effac3242a57fe4cf1b9d563e GIT binary patch literal 39136 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 (count - (endIndex - startIndex))) + { + startIndex = count - (endIndex - startIndex); + } + pressed = true; + } + } } else { @@ -2984,22 +3007,25 @@ RAYGUIDEF bool GuiListView(Rectangle bounds, const char **text, int count, int * } // Draw scrollBar background - if (useScrollBar) DrawRectangle(bounds.x, bounds.y, style[LISTVIEW_BAR_WIDTH], bounds.height, Fade(LIGHTGRAY, guiAlpha)); + if (useScrollBar) DrawRectangle(bounds.x, bounds.y, style[LISTVIEW_BAR_WIDTH], bounds.height, Fade(GetColor(style[DEFAULT_BORDER_COLOR_DISABLED]), guiAlpha)); // Draw ListView states switch (state) { case NORMAL: - case LOCKED: { if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[SLIDERBAR_BORDER_COLOR_NORMAL]), guiAlpha)); DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_NORMAL]), guiAlpha)); + + if(auxActive >= startIndex && auxActive < endIndex) GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (auxActive - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[auxActive], true, false); } break; case FOCUSED: { if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[SLIDERBAR_BASE_COLOR_FOCUSED]), guiAlpha)); DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_FOCUSED]), guiAlpha)); + + if(auxActive >= startIndex && auxActive < endIndex) GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (auxActive - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[auxActive], true, false); } break; case PRESSED: { @@ -3042,7 +3068,7 @@ RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color) // Update control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { Vector2 mousePoint = GetMousePosition(); @@ -3078,7 +3104,7 @@ RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color) // Draw control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { DrawRectangleGradientEx(bounds, Fade(WHITE, guiAlpha), Fade(WHITE, guiAlpha), Fade(maxHueCol, guiAlpha), Fade(maxHueCol, guiAlpha)); DrawRectangleGradientEx(bounds, Fade(BLACK, 0), Fade(BLACK, guiAlpha), Fade(BLACK, guiAlpha), Fade(BLACK, 0)); @@ -3095,7 +3121,7 @@ RAYGUIDEF Color GuiColorPanel(Rectangle bounds, Color color) switch (state) { - case NORMAL: case LOCKED: DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_NORMAL]), guiAlpha)); break; + case NORMAL: DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_NORMAL]), guiAlpha)); break; case FOCUSED: DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_FOCUSED]), guiAlpha)); break; case PRESSED: DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_PRESSED]), guiAlpha)); break; case DISABLED: DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_DISABLED]), guiAlpha)); break; @@ -3121,7 +3147,7 @@ RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha) // Update control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { Vector2 mousePoint = GetMousePosition(); @@ -3146,7 +3172,7 @@ RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha) // Draw control //-------------------------------------------------------------------- // Draw alpha bar: checked background - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { for (int i = 0; i < bounds.width/CHECKER_SIZE; i++) DrawRectangle(bounds.x + CHECKER_SIZE*(i%((int)bounds.width/CHECKER_SIZE)), bounds.y, bounds.width/(bounds.width/CHECKER_SIZE), CHECKER_SIZE, (i%2) ? Fade(Fade(GRAY, 0.4f), guiAlpha) : Fade(Fade(RAYWHITE, 0.4f), guiAlpha)); for (int i = 0; i < bounds.width/CHECKER_SIZE; i++) DrawRectangle(bounds.x + CHECKER_SIZE*(i%((int)bounds.width/CHECKER_SIZE)), bounds.y + CHECKER_SIZE, bounds.width/(bounds.width/CHECKER_SIZE), CHECKER_SIZE, (i%2) ? Fade(Fade(RAYWHITE, 0.4f), guiAlpha) : Fade(Fade(GRAY, 0.4f), guiAlpha)); @@ -3157,8 +3183,7 @@ RAYGUIDEF float GuiColorBarAlpha(Rectangle bounds, float alpha) switch (state) { - case NORMAL: - case LOCKED: + case NORMAL: { DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_NORMAL]), guiAlpha)); DrawRectangle(selector.x , selector.y, selector.width, selector.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_PRESSED]), guiAlpha)); @@ -3197,7 +3222,7 @@ RAYGUIDEF float GuiColorBarHue(Rectangle bounds, float hue) // Update control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { Vector2 mousePoint = GetMousePosition(); @@ -3231,7 +3256,7 @@ RAYGUIDEF float GuiColorBarHue(Rectangle bounds, float hue) //-------------------------------------------------------------------- // Draw control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { //Draw hue bar:color bars DrawRectangleGradientV(bounds.x + GUICOLORBARHUE_SELECTOR_PADDING/2, bounds.y + GUICOLORBARHUE_SELECTOR_PADDING/2, bounds.width - GUICOLORBARHUE_SELECTOR_PADDING, (int)bounds.height/6, Fade((Color){ 255,0,0,255 }, guiAlpha), Fade((Color){ 255,255,0,255 }, guiAlpha)); @@ -3249,7 +3274,6 @@ RAYGUIDEF float GuiColorBarHue(Rectangle bounds, float hue) switch (state) { case NORMAL: - case LOCKED: { // Draw hue bar: selector DrawRectangleLines(bounds.x, bounds.y, bounds.width, bounds.height, Fade(GetColor(style[COLORPICKER_BORDER_COLOR_NORMAL]), guiAlpha)); @@ -3349,7 +3373,7 @@ RAYGUIDEF Vector2 GuiGrid(Rectangle bounds, int spacing, int subdivs) // Update control //-------------------------------------------------------------------- - if ((state != DISABLED) && (state != LOCKED)) + if ((state != DISABLED) && !guiLocked) { // Check mouse position if snap if (CheckCollisionPointRec(mousePoint, bounds)) @@ -3365,7 +3389,6 @@ RAYGUIDEF Vector2 GuiGrid(Rectangle bounds, int spacing, int subdivs) switch (state) { case NORMAL: - case LOCKED: { // Draw vertical grid lines for (int i = 0; i < (bounds.width/spacing + 1)*subdivs; i++)