3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GuiValueBox, GuiTextBox, GuiTextBoxMulti minor changes.

Browse Source
This commit is contained in:
Sergio Martínez 2018-10-10 17:12:01 +02:00
parent e545995375
commit 773c895af9
2 changed files with 174 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/controls_review/controls_review.c
View File

@ -40,7 +40,7 @@ int main()
char TextBox003Text[64] = "SAMPLE TEXT"; char TextBox003Text[64] = "SAMPLE TEXT";
int ListView004Active = 0; int ListView004Active = 0;
const char *ListView004TextList[3] = { "ONE", "TWO", "THREE" }; const char *ListView004TextList[3] = { "ONE", "TWO", "THREE" };
char TextBox006Text[128] = "SAMPLE TEXT"; char TextBox006Text[141] = "SAMPLE TEXT";
bool spinnerEditMode = false; bool spinnerEditMode = false;
bool valueBoxEditMode = false; bool valueBoxEditMode = false;
@ -75,7 +75,7 @@ int main()
ListView004Active = GuiListView((Rectangle){ 175, 25, 125, 325 }, ListView004TextList, 3, ListView004Active); ListView004Active = GuiListView((Rectangle){ 175, 25, 125, 325 }, ListView004TextList, 3, ListView004Active);
if (GuiButton((Rectangle){ 25, 225, 125, 30 }, "SAMPLE TEXT")) Button005(); if (GuiButton((Rectangle){ 25, 225, 125, 30 }, "SAMPLE TEXT")) Button005();
if (GuiTextBoxMulti((Rectangle){ 325, 25, 225, 175 }, TextBox006Text, 128, multiTextBoxEditMode)) multiTextBoxEditMode = !multiTextBoxEditMode;; if (GuiTextBoxMulti((Rectangle){ 325, 25, 225, 175 }, TextBox006Text, 141, multiTextBoxEditMode)) multiTextBoxEditMode = !multiTextBoxEditMode;;
//GuiScrollPanel((Rectangle){ 325, 225, 225, 125 }, "SAMPLE TEXT"); //GuiScrollPanel((Rectangle){ 325, 225, 225, 125 }, "SAMPLE TEXT");
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------

180
src/raygui.h
View File

@ -405,7 +405,7 @@ RAYGUIDEF bool GuiMessageBox(Rectangle bounds, const char *windowTitle, const ch
#if defined(RAYGUI_STYLE_SAVE_LOAD) #if defined(RAYGUI_STYLE_SAVE_LOAD)
RAYGUIDEF void GuiSaveStyle(const char *fileName, bool binary); // Save style file (.rgs), text or binary RAYGUIDEF void GuiSaveStyle(const char *fileName, bool binary); // Save style file (.rgs), text or binary
RAYGUIDEF void GuiLoadStyle(const char *fileName); // Load style file (.rgs), text or binary RAYGUIDEF void GuiLoadStyle(const char *fileName); // Load style file (.rgs), text or binary
RAYGUIDEF void GuiLoadStylePalette(int *palette); // Load style from a color palette array (14 values required) RAYGUIDEF void GuiLoadStylePalette(const int *palette); // Load style from a color palette array (14 values required)
RAYGUIDEF void GuiLoadStylePaletteImage(const char *fileName); // Load style from an image palette file (64x16) RAYGUIDEF void GuiLoadStylePaletteImage(const char *fileName); // Load style from an image palette file (64x16)
RAYGUIDEF void GuiUpdateStyleComplete(void); // Updates full style properties set with generic values RAYGUIDEF void GuiUpdateStyleComplete(void); // Updates full style properties set with generic values
@ -1768,7 +1768,8 @@ RAYGUIDEF bool GuiSpinner(Rectangle bounds, int *value, int minValue, int maxVal
// NOTE: Requires static variables: framesCounter // NOTE: Requires static variables: framesCounter
RAYGUIDEF bool GuiValueBox(Rectangle bounds, int *value, int minValue, int maxValue, bool editMode) RAYGUIDEF bool GuiValueBox(Rectangle bounds, int *value, int minValue, int maxValue, bool editMode)
{ {
#define GUIVALUEBOX_CHAR_COUNT 8 #define GUIVALUEBOX_CHAR_COUNT 32
#define KEY_BACKSPACE_TEXT 259 // GLFW BACKSPACE: 3 + 256
bool pressed = false; bool pressed = false;
@ -1787,7 +1788,7 @@ RAYGUIDEF bool GuiValueBox(Rectangle bounds, int *value, int minValue, int maxVa
{ {
Vector2 mousePoint = GetMousePosition(); Vector2 mousePoint = GetMousePosition();
#define KEY_BACKSPACE_TEXT 259 // GLFW BACKSPACE: 3 + 256 bool valueHasChanged = false;
if (editMode) if (editMode)
{ {
@ -1795,32 +1796,44 @@ RAYGUIDEF bool GuiValueBox(Rectangle bounds, int *value, int minValue, int maxVa
framesCounter++; framesCounter++;
int key = GetKeyPressed();
int keyCount = strlen(text); int keyCount = strlen(text);
// NOTE: Only allow keys in range [48..57] // Only allow keys in range [48..57]
if (keyCount < GUIVALUEBOX_CHAR_COUNT)
if ((key >= 48) && (key <= 57) && (keyCount < GUIVALUEBOX_CHAR_COUNT)) {
int maxWidth = (bounds.width - (DEFAULT_TEXT_PADDING * 2));
if (MeasureText(text, style[DEFAULT_TEXT_SIZE]) < maxWidth)
{
int key = GetKeyPressed();
if ((key >= 48) && (key <= 57))
{ {
text[keyCount] = (char)key; text[keyCount] = (char)key;
keyCount++; keyCount++;
valueHasChanged = true;
}
}
} }
if ((keyCount > 0) && IsKeyPressed(KEY_BACKSPACE_TEXT)) // Delete text
if (keyCount > 0)
{
if (IsKeyPressed(KEY_BACKSPACE_TEXT))
{ {
keyCount--; keyCount--;
text[keyCount] = '\0'; text[keyCount] = '\0';
framesCounter = 0; framesCounter = 0;
if (keyCount < 0) keyCount = 0; if (keyCount < 0) keyCount = 0;
valueHasChanged = true;
} }
else if ((keyCount > 0) && IsKeyDown(KEY_BACKSPACE_TEXT)) else if (IsKeyDown(KEY_BACKSPACE_TEXT))
{ {
if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--; if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--;
text[keyCount] = '\0'; text[keyCount] = '\0';
if (keyCount < 0) keyCount = 0; if (keyCount < 0) keyCount = 0;
valueHasChanged = true;
} }
}
*value = atoi(text); if (valueHasChanged) *value = atoi(text);
} }
else else
{ {
@ -1900,27 +1913,38 @@ RAYGUIDEF bool GuiTextBox(Rectangle bounds, char *text, int textSize, bool editM
int key = GetKeyPressed(); int key = GetKeyPressed();
int keyCount = strlen(text); int keyCount = strlen(text);
// NOTE: Only allow keys in range [32..125] // Only allow keys in range [32..125]
if ((key >= 32) && (key <= 125) && (keyCount < (textSize - 1))) if (keyCount < (textSize - 1))
{
int maxWidth = (bounds.width - (DEFAULT_TEXT_PADDING * 2));
if (MeasureText(text, style[DEFAULT_TEXT_SIZE]) < maxWidth - style[DEFAULT_TEXT_SIZE])
{
if ((key >= 32) && (key <= 125))
{ {
text[keyCount] = (char)key; text[keyCount] = (char)key;
keyCount++; keyCount++;
} }
}
}
if ((keyCount > 0) && IsKeyPressed(KEY_BACKSPACE_TEXT)) // Delete text
if (keyCount > 0)
{
if (IsKeyPressed(KEY_BACKSPACE_TEXT))
{ {
keyCount--; keyCount--;
text[keyCount] = '\0'; text[keyCount] = '\0';
framesCounter = 0; framesCounter = 0;
if (keyCount < 0) keyCount = 0; if (keyCount < 0) keyCount = 0;
} }
else if ((keyCount > 0) && IsKeyDown(KEY_BACKSPACE_TEXT)) else if (IsKeyDown(KEY_BACKSPACE_TEXT))
{ {
if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--; if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--;
text[keyCount] = '\0'; text[keyCount] = '\0';
if (keyCount < 0) keyCount = 0; if (keyCount < 0) keyCount = 0;
} }
} }
}
// Note: Changing editMode // Note: Changing editMode
if (!editMode) if (!editMode)
@ -1978,8 +2002,10 @@ RAYGUIDEF bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool
GuiControlState state = guiState; GuiControlState state = guiState;
static int framesCounter = 0; // Required for blinking cursor static int framesCounter = 0; // Required for blinking cursor
bool pressed = false; bool pressed = false;
bool textHasChange = false;
int currentLine = 0; int currentLine = 0;
const char *numChars = "";
// Update control // Update control
//-------------------------------------------------------------------- //--------------------------------------------------------------------
if (state != DISABLED) if (state != DISABLED)
@ -1995,9 +2021,66 @@ RAYGUIDEF bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool
framesCounter++; framesCounter++;
int keyCount = strlen(text); int keyCount = strlen(text);
int maxWidth = (bounds.width - (DEFAULT_TEXT_PADDING*2));
int maxHeight = (bounds.height - (DEFAULT_TEXT_PADDING*2));
numChars = FormatText("%i/%i", keyCount, textSize - 1);
// Only allow keys in range [32..125]
if (keyCount < (textSize - 1))
{
int key = GetKeyPressed();
if (MeasureTextEx(GetFontDefault(), text, style[DEFAULT_TEXT_SIZE], 1).y < (maxHeight - style[DEFAULT_TEXT_SIZE]))
{
if (IsKeyPressed(KEY_ENTER))
{
text[keyCount] = '\n';
keyCount++;
}
else if ((key >= 32) && (key <= 125))
{
text[keyCount] = (char)key;
keyCount++;
textHasChange = true;
}
}
else if(MeasureText(strrchr(text, '\n'), style[DEFAULT_TEXT_SIZE]) < (maxWidth - style[DEFAULT_TEXT_SIZE]))
{
if ((key >= 32) && (key <= 125))
{
text[keyCount] = (char)key;
keyCount++;
textHasChange = true;
}
}
}
// Delete text
if (keyCount > 0)
{
if (IsKeyPressed(KEY_BACKSPACE_TEXT))
{
keyCount--;
text[keyCount] = '\0';
framesCounter = 0;
if (keyCount < 0) keyCount = 0;
textHasChange = true;
}
else if (IsKeyDown(KEY_BACKSPACE_TEXT))
{
if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--;
text[keyCount] = '\0';
if (keyCount < 0) keyCount = 0;
textHasChange = true;
}
}
// Introduce automatic new line if necessary
if (textHasChange)
{
textHasChange = false;
char *lastLine = strrchr(text, '\n'); char *lastLine = strrchr(text, '\n');
int maxWidth = (bounds.width - (DEFAULT_TEXT_PADDING * 2)); int maxWidth = (bounds.width - (DEFAULT_TEXT_PADDING * 2));
if (lastLine != NULL) if (lastLine != NULL)
@ -2045,61 +2128,13 @@ RAYGUIDEF bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool
} }
} }
} }
/*if (((MeasureText(text, style[DEFAULT_TEXT_SIZE])) > bounds.width - DEFAULT_TEXT_PADDING))
{
char *ptr = strrchr(text, '\n');
if (MeasureText(ptr, style[DEFAULT_TEXT_SIZE]) > bounds.width - DEFAULT_TEXT_PADDING)
{
} }
else if (ptr != NULL)
{
int index = ptr - text;
text[index] = '\n';
}
}*/
// Counting how many new lines // Counting how many new lines
for (int i = 0; i < keyCount; i++) for (int i = 0; i < keyCount; i++)
{ {
if (text[i] == '\n') currentLine++; if (text[i] == '\n') currentLine++;
} }
// Only allow keys in range [32..125]
if (keyCount < (textSize - 1))
{
int key = GetKeyPressed();
if (IsKeyPressed(KEY_ENTER))
{
text[keyCount] = '\n';
keyCount++;
}
else if ((key >= 32) && (key <= 125))
{
text[keyCount] = (char)key;
keyCount++;
}
}
// Delete text
if (keyCount > 0)
{
if (IsKeyPressed(KEY_BACKSPACE_TEXT))
{
keyCount--;
text[keyCount] = '\0';
framesCounter = 0;
if (keyCount < 0) keyCount = 0;
}
else if (IsKeyDown(KEY_BACKSPACE_TEXT))
{
if ((framesCounter > LINE_BLINK_FRAMES) && (framesCounter%2) == 0) keyCount--;
text[keyCount] = '\0';
if (keyCount < 0) keyCount = 0;
}
}
} }
// Changing editMode // Changing editMode
@ -2136,7 +2171,20 @@ RAYGUIDEF bool GuiTextBoxMulti(Rectangle bounds, char *text, int textSize, bool
DrawRectangle(bounds.x + style[TEXTBOX_BORDER_WIDTH], bounds.y + style[TEXTBOX_BORDER_WIDTH], bounds.width - 2*style[TEXTBOX_BORDER_WIDTH], bounds.height - 2*style[TEXTBOX_BORDER_WIDTH], Fade(GetColor(style[TEXTBOX_BASE_COLOR_FOCUSED]), guiAlpha)); DrawRectangle(bounds.x + style[TEXTBOX_BORDER_WIDTH], bounds.y + style[TEXTBOX_BORDER_WIDTH], bounds.width - 2*style[TEXTBOX_BORDER_WIDTH], bounds.height - 2*style[TEXTBOX_BORDER_WIDTH], Fade(GetColor(style[TEXTBOX_BASE_COLOR_FOCUSED]), guiAlpha));
DrawText(text, bounds.x + GUITEXTBOXMULTI_PADDING, bounds.y + GUITEXTBOXMULTI_PADDING, style[DEFAULT_TEXT_SIZE], Fade(GetColor(style[TEXTBOX_TEXT_COLOR_PRESSED]), guiAlpha)); DrawText(text, bounds.x + GUITEXTBOXMULTI_PADDING, bounds.y + GUITEXTBOXMULTI_PADDING, style[DEFAULT_TEXT_SIZE], Fade(GetColor(style[TEXTBOX_TEXT_COLOR_PRESSED]), guiAlpha));
if (editMode && ((framesCounter/20)%2 == 0)) DrawRectangle(bounds.x + GUITEXTBOXMULTI_LINE_PADDING + MeasureText(text, style[DEFAULT_TEXT_SIZE]), bounds.y + GUITEXTBOXMULTI_PADDING + (style[DEFAULT_TEXT_SIZE] + GUITEXTBOXMULTI_LINE_PADDING)*currentLine, 1, style[DEFAULT_TEXT_SIZE]*2, Fade(GetColor(style[TEXTBOX_BORDER_COLOR_FOCUSED]), guiAlpha)); if (editMode)
{
if ((framesCounter/20)%2 == 0)
{
char *line;
if (currentLine > 0) line = strrchr(text, '\n');
else line = text;
DrawRectangle(bounds.x + style[TEXTBOX_BORDER_WIDTH] + DEFAULT_TEXT_PADDING + MeasureText(line, style[DEFAULT_TEXT_SIZE]), bounds.y + style[TEXTBOX_BORDER_WIDTH] + DEFAULT_TEXT_PADDING/2 + ((style[DEFAULT_TEXT_SIZE] + DEFAULT_TEXT_LINE_PADDING)*currentLine), 1, style[DEFAULT_TEXT_SIZE] + DEFAULT_TEXT_PADDING, Fade(GetColor(style[TEXTBOX_BORDER_COLOR_FOCUSED]), guiAlpha));
}
DrawText(numChars, bounds.x + bounds.width - MeasureText(numChars, style[DEFAULT_TEXT_SIZE]) - DEFAULT_TEXT_LINE_PADDING, bounds.y + bounds.height - style[DEFAULT_TEXT_SIZE] - DEFAULT_TEXT_LINE_PADDING, style[DEFAULT_TEXT_SIZE], Fade(GetColor(style[TEXTBOX_TEXT_COLOR_PRESSED]), guiAlpha/2));
}
} break; } break;
case PRESSED: break; // NOTE: State not used on this control case PRESSED: break; // NOTE: State not used on this control
case DISABLED: case DISABLED:
@ -3349,7 +3397,7 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
} }
// Load style from a color palette array (14 values required) // Load style from a color palette array (14 values required)
RAYGUIDEF void GuiLoadStylePalette(int *palette) RAYGUIDEF void GuiLoadStylePalette(const int *palette)
{ {
// Load generic style color palette // Load generic style color palette
style[DEFAULT_BACKGROUND_COLOR] = palette[0]; style[DEFAULT_BACKGROUND_COLOR] = palette[0];