mirror of
https://github.com/raysan5/raygui.git
synced 2025-12-25 10:22:33 -05:00
GuiListViewEx: Use a elements enable list.
controls_review.c updated
This commit is contained in:
@ -32,42 +32,42 @@ int main()
|
||||
|
||||
// layout_file_name: controls initialization
|
||||
//----------------------------------------------------------------------------------
|
||||
|
||||
int DropdownBox000Active = 0;
|
||||
int DropdownBox001Active = 0;
|
||||
const char *DropdownBox000TextList[3] = { "ONE", "TWO", "THREE" };
|
||||
int Spinner001Value = 0;
|
||||
int ValueBox002Value = 0;
|
||||
char TextBox003Text[64] = "SAMPLE TEXT";
|
||||
int ListView004Active = -1;
|
||||
const char *ListView004TextList[6] = { "Charmander", "Bulbasaur", "Squirtel", "Pikachu", "Eevee", "Pidgey" };
|
||||
char TextBox006Text[141] = "SAMPLE TEXT";
|
||||
|
||||
bool spinnerEditMode = false;
|
||||
bool valueBoxEditMode = false;
|
||||
bool textBoxEditMode = false;
|
||||
bool multiTextBoxEditMode = false;
|
||||
|
||||
bool listViewEditMode = false;
|
||||
|
||||
int dropdownBox000Active = 0;
|
||||
const char *dropdownBox000TextList[3] = { "ONE", "TWO", "THREE" };
|
||||
bool dropDown000EditMode = false;
|
||||
bool dropDown001EditMode = false;
|
||||
|
||||
bool forceSquaredChecked = false;
|
||||
|
||||
//int *enableElements = (int *)malloc(6*sizeof(int));
|
||||
int enableElements[6] = {0, 0, 0, 0, 0, 0};
|
||||
int dropdownBox001Active = 0;
|
||||
const char *dropdownBox001TextList[5] = { "ONE", "TWO", "THREE", "FOUR", "FIVE" };
|
||||
bool dropDown001EditMode = false;
|
||||
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
enableElements[i] = 1;
|
||||
}
|
||||
|
||||
Color colorPickerValue = RED;
|
||||
int spinner001Value = 0;
|
||||
bool spinnerEditMode = false;
|
||||
|
||||
int valueBox002Value = 0;
|
||||
bool valueBoxEditMode = false;
|
||||
|
||||
char textBoxText[64] = "Text box";
|
||||
bool textBoxEditMode = false;
|
||||
|
||||
int listViewScrollIndex = 1;
|
||||
int listViewActive = -1;
|
||||
const char *listViewList[6] = { "Charmander", "Bulbasaur", "Squirtel", "Pikachu", "Eevee", "Pidgey" };
|
||||
bool listViewEditMode = false;
|
||||
|
||||
int listViewExScrollIndex = 0;
|
||||
int listViewExActive = -1;
|
||||
const char *listViewExList[8] = { "This", "is", "a", "list view", "with", "disable", "elements", "amazing!" };
|
||||
int listViewExElementsEnable[8] = {1, 0, 1, 1, 0, 0, 1};
|
||||
bool listViewExEditMode = false;
|
||||
|
||||
char multiTextBoxText[141] = "Multi text box";
|
||||
bool multiTextBoxEditMode = false;
|
||||
|
||||
bool forceSquaredChecked = false;
|
||||
//----------------------------------------------------------------------------------
|
||||
|
||||
Font font = LoadFontEx("fonts/NorthernLights.ttf", 30, 0, 0);
|
||||
GuiFont(font);
|
||||
//Font font = LoadFontEx("fonts/rainyhearts16.ttf", 12, 0, 0);
|
||||
//GuiFont(font);
|
||||
|
||||
SetTargetFPS(60);
|
||||
//--------------------------------------------------------------------------------------
|
||||
@ -89,32 +89,34 @@ int main()
|
||||
// raygui: controls drawing
|
||||
//----------------------------------------------------------------------------------
|
||||
if (dropDown000EditMode || dropDown001EditMode) GuiLock();
|
||||
GuiDisable();
|
||||
//if (GuiSpinner((Rectangle){ 25, 75, 125, 30 }, &Spinner001Value, 0, 100, 25, spinnerEditMode)) spinnerEditMode = !spinnerEditMode;
|
||||
if (GuiValueBox((Rectangle){ 25, 125, 125, 30 }, &ValueBox002Value, 0, 100, valueBoxEditMode)) valueBoxEditMode = !valueBoxEditMode;
|
||||
if (GuiTextBox((Rectangle){ 25, 175, 125, 30 }, TextBox003Text, 64, textBoxEditMode)) textBoxEditMode = !textBoxEditMode;
|
||||
|
||||
//if (GuiListView((Rectangle){ 175, 25, 120, 100 }, ListView004TextList, 6, &ListView004Active, listViewEditMode)) listViewEditMode = !listViewEditMode;
|
||||
if (GuiListViewEx((Rectangle){ 175, 25, 120, 100 }, ListView004TextList, enableElements, 6, &ListView004Active, listViewEditMode)) listViewEditMode = !listViewEditMode;
|
||||
if (GuiButton((Rectangle){ 25, 225, 125, 30 }, "SAMPLE TEXT")) Button005();
|
||||
|
||||
if (GuiTextBoxMulti((Rectangle){ 325, 25, 225, 175 }, TextBox006Text, 141, multiTextBoxEditMode)) multiTextBoxEditMode = !multiTextBoxEditMode;
|
||||
|
||||
//GuiScrollPanel((Rectangle){ 325, 225, 225, 125 }, "SAMPLE TEXT");
|
||||
if (GuiDropdownBox((Rectangle){ 25, 75, 125, 30 }, DropdownBox000TextList, 3, &DropdownBox001Active, dropDown001EditMode)) dropDown001EditMode = !dropDown001EditMode;
|
||||
forceSquaredChecked = GuiCheckBoxEx((Rectangle){ 25, 65, 15, 15 }, forceSquaredChecked, "Force Square");
|
||||
//GuiDisable();
|
||||
if (GuiDropdownBox((Rectangle){ 25, 25, 125, 30 }, DropdownBox000TextList, 3, &DropdownBox000Active, dropDown000EditMode)) dropDown000EditMode = !dropDown000EditMode;
|
||||
|
||||
colorPickerValue = GuiColorPicker((Rectangle){ 325, 220, 240, 240 }, colorPickerValue);
|
||||
GuiEnable();
|
||||
// First GUI column
|
||||
forceSquaredChecked = GuiCheckBoxEx((Rectangle){ 25, 108, 15, 15 }, forceSquaredChecked, "Force Square");
|
||||
if (GuiSpinner((Rectangle){ 25, 135, 125, 30 }, &spinner001Value, 0, 100, 25, spinnerEditMode)) spinnerEditMode = !spinnerEditMode;
|
||||
if (GuiValueBox((Rectangle){ 25, 175, 125, 30 }, &valueBox002Value, 0, 100, valueBoxEditMode)) valueBoxEditMode = !valueBoxEditMode;
|
||||
if (GuiTextBox((Rectangle){ 25, 215, 125, 30 }, textBoxText, 64, textBoxEditMode)) textBoxEditMode = !textBoxEditMode;
|
||||
if (GuiButton((Rectangle){ 25, 255, 125, 30 }, "SAMPLE TEXT")) Button005();
|
||||
// NOTE: GuiDropdownBox must draw at the end of the column
|
||||
if (GuiDropdownBox((Rectangle){ 25, 65, 125, 30 }, dropdownBox001TextList, 5, &dropdownBox001Active, dropDown001EditMode)) dropDown001EditMode = !dropDown001EditMode;
|
||||
if (GuiDropdownBox((Rectangle){ 25, 25, 125, 30 }, dropdownBox000TextList, 3, &dropdownBox000Active, dropDown000EditMode)) dropDown000EditMode = !dropDown000EditMode;
|
||||
|
||||
// Second GUI column
|
||||
if (GuiListView((Rectangle){ 185, 25, 120, 100 }, listViewList, 6, &listViewScrollIndex, &listViewActive, listViewEditMode)) listViewEditMode = !listViewEditMode;
|
||||
if (GuiListViewEx((Rectangle){ 185, 155, 120, 200 }, listViewExList, listViewExElementsEnable, 8, &listViewExScrollIndex, &listViewExActive, listViewExEditMode)) listViewExEditMode = !listViewExEditMode;
|
||||
|
||||
// Third GUI column
|
||||
if (GuiTextBoxMulti((Rectangle){ 325, 25, 225, 175 }, multiTextBoxText, 141, multiTextBoxEditMode)) multiTextBoxEditMode = !multiTextBoxEditMode;
|
||||
|
||||
//GuiEnable();
|
||||
GuiUnlock();
|
||||
|
||||
// Fourth GUI column
|
||||
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(0); if (GuiButton((Rectangle){ 600, 25, 125, 30 }, "DISABLE")) Button005();
|
||||
GuiState(1); if (GuiButton((Rectangle){ 600, 65, 125, 30 }, "NORMAL")) Button005();
|
||||
GuiState(2); if (GuiButton((Rectangle){ 600, 105, 125, 30 }, "FOCUSED")) Button005();
|
||||
GuiState(3); if (GuiButton((Rectangle){ 600, 145, 125, 30 }, "PRESSED")) Button005();
|
||||
GuiState(1);
|
||||
GuiUnlock();
|
||||
//----------------------------------------------------------------------------------
|
||||
@ -139,4 +141,3 @@ static void Button005()
|
||||
{
|
||||
// TODO: Implement control logic
|
||||
}
|
||||
|
||||
|
||||
292
src/raygui.h
292
src/raygui.h
@ -408,8 +408,8 @@ RAYGUIDEF void GuiStatusBar(Rectangle bounds, const char *text, int offsetX);
|
||||
RAYGUIDEF void GuiDummyRec(Rectangle bounds, const char *text); // Dummy control for placeholders
|
||||
|
||||
// Advance controls set
|
||||
RAYGUIDEF bool GuiListView(Rectangle bounds, const char **text, int count, int *active, bool editMode); // List View control, returns selected list element index
|
||||
RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableElements, int count, int *active, bool editMode);
|
||||
RAYGUIDEF bool GuiListView(Rectangle bounds, const char **text, int count, int*scrollIndex, int *active, bool editMode); // List View control, returns selected list element index
|
||||
RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enabledElements, int count, int *scrollIndex, int *active, bool editMode);
|
||||
RAYGUIDEF Color GuiColorPicker(Rectangle bounds, Color color); // Color Picker control
|
||||
RAYGUIDEF bool GuiMessageBox(Rectangle bounds, const char *windowTitle, const char *message); // Message Box control, displays a message
|
||||
|
||||
@ -2888,222 +2888,39 @@ static bool GuiListElement(Rectangle bounds, const char *text, bool active, bool
|
||||
}
|
||||
|
||||
// List View control, returns selected list element index // int *startIndex)
|
||||
RAYGUIDEF bool GuiListView(Rectangle bounds, const char **text, int count, int *active, bool editMode)
|
||||
{
|
||||
#define LISTVIEW_LINE_THICK 1
|
||||
|
||||
GuiControlState state = guiState;
|
||||
|
||||
bool pressed = false;
|
||||
|
||||
static int startIndex = 0;
|
||||
bool useScrollBar = true;
|
||||
bool pressedKey = false;
|
||||
|
||||
int visibleElements = bounds.height/(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]);
|
||||
int endIndex = startIndex + visibleElements;
|
||||
|
||||
int auxActive = *active;
|
||||
|
||||
float barHeight = bounds.height;
|
||||
float minBarHeight = 10;
|
||||
float barPosY = 0;
|
||||
|
||||
// All the elements fit inside ListView and dont need scrollbar.
|
||||
if (visibleElements >= count)
|
||||
{
|
||||
useScrollBar = false;
|
||||
startIndex = 0;
|
||||
endIndex = count;
|
||||
}
|
||||
|
||||
|
||||
// Update control
|
||||
//--------------------------------------------------------------------
|
||||
if ((state != DISABLED) && !guiLocked) // && !guiLocked
|
||||
{
|
||||
Vector2 mousePoint = GetMousePosition();
|
||||
|
||||
if (editMode)
|
||||
{
|
||||
state = PRESSED;
|
||||
|
||||
// Change active with keys
|
||||
if (IsKeyPressed(KEY_UP))
|
||||
{
|
||||
if (auxActive > 0)
|
||||
{
|
||||
auxActive--;
|
||||
if ((useScrollBar) && (auxActive < startIndex)) startIndex--;
|
||||
}
|
||||
pressedKey = true;
|
||||
}
|
||||
else if (IsKeyPressed(KEY_DOWN))
|
||||
{
|
||||
if (auxActive < count - 1)
|
||||
{
|
||||
auxActive++;
|
||||
if ((useScrollBar) && (auxActive >= endIndex)) startIndex++;
|
||||
}
|
||||
pressedKey = true;
|
||||
}
|
||||
|
||||
if (useScrollBar)
|
||||
{
|
||||
endIndex = startIndex + visibleElements;
|
||||
int wheel = GetMouseWheelMove();
|
||||
|
||||
if (wheel < 0 && endIndex < count) startIndex -= wheel;
|
||||
else if (wheel > 0 && startIndex > 0) startIndex -= wheel;
|
||||
|
||||
if (pressedKey)
|
||||
{
|
||||
pressedKey = false;
|
||||
if ((auxActive < startIndex) || (auxActive >= endIndex)) startIndex = auxActive;
|
||||
}
|
||||
|
||||
if (startIndex < 0) startIndex = 0;
|
||||
else if (startIndex > (count - (endIndex - startIndex)))
|
||||
{
|
||||
startIndex = count - (endIndex - startIndex);
|
||||
}
|
||||
|
||||
endIndex = startIndex + visibleElements;
|
||||
if (endIndex > count) endIndex = count;
|
||||
}
|
||||
}
|
||||
// ------------------------------------------------------------------------------------
|
||||
|
||||
// Note: Changing editMode
|
||||
if (!editMode)
|
||||
{
|
||||
if (CheckCollisionPointRec(mousePoint, bounds))
|
||||
{
|
||||
state = FOCUSED;
|
||||
if (IsMouseButtonPressed(0)) pressed = true;
|
||||
|
||||
int wheel = GetMouseWheelMove();
|
||||
if (wheel)
|
||||
{
|
||||
startIndex -= wheel;
|
||||
if (startIndex < 0) startIndex = 0;
|
||||
else if (startIndex > (count - (endIndex - startIndex)))
|
||||
{
|
||||
startIndex = count - (endIndex - startIndex);
|
||||
}
|
||||
pressed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!CheckCollisionPointRec(mousePoint, bounds) && IsMouseButtonPressed(0)) pressed = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Calculamos el porcentaje de elementos visibles, y aplicamos el mismo porcentaje al tamaño de la barra original.
|
||||
// Hay que tener en cuenta un valor mínimo para que la barra no sea de 1 px nunca y también que no sea mayor que la altura máxima.
|
||||
if (useScrollBar)
|
||||
{
|
||||
float percentVisible = (endIndex - startIndex)*100/count;
|
||||
barHeight *= percentVisible/100;
|
||||
if (barHeight < minBarHeight) barHeight = minBarHeight;
|
||||
else if (barHeight > bounds.height) barHeight = bounds.height;
|
||||
// Posición Y a la que dibujamos la barra.
|
||||
barPosY = bounds.y + startIndex*((bounds.height - barHeight)/(count - (endIndex - startIndex)));
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
// Draw control
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
// Draw background
|
||||
DrawRectangleRec(bounds, GetColor(style[DEFAULT_BACKGROUND_COLOR]));
|
||||
|
||||
int posX = bounds.x + style[LISTVIEW_BAR_WIDTH] + style[LISTVIEW_ELEMENTS_PADDING];
|
||||
int elementWidth = bounds.width - style[LISTVIEW_BAR_WIDTH] - 2*style[LISTVIEW_ELEMENTS_PADDING] - LISTVIEW_LINE_THICK;
|
||||
if (!useScrollBar)
|
||||
{
|
||||
posX = bounds.x + style[LISTVIEW_ELEMENTS_PADDING];
|
||||
elementWidth = bounds.width - 2*style[LISTVIEW_ELEMENTS_PADDING] - LISTVIEW_LINE_THICK;
|
||||
}
|
||||
|
||||
// Draw GuiListElements
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (i == auxActive && editMode)
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, true) == false) auxActive = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, true) == true) auxActive = i;
|
||||
}
|
||||
}
|
||||
|
||||
// Draw scrollBar background
|
||||
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:
|
||||
{
|
||||
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:
|
||||
{
|
||||
if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[SLIDERBAR_BASE_COLOR_PRESSED]), guiAlpha));
|
||||
DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_PRESSED]), guiAlpha));
|
||||
} break;
|
||||
case DISABLED:
|
||||
{
|
||||
if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[LISTVIEW_BASE_COLOR_DISABLED]), guiAlpha));
|
||||
|
||||
DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_DISABLED]), guiAlpha));
|
||||
} break;
|
||||
default: break;
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
*active = auxActive;
|
||||
return pressed;
|
||||
RAYGUIDEF bool GuiListView(Rectangle bounds, const char **text, int count, int*scrollIndex, int *active, bool editMode)
|
||||
{
|
||||
return GuiListViewEx(bounds, text, NULL, count, scrollIndex, active, editMode);
|
||||
}
|
||||
|
||||
RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableElements, int count, int *active, bool editMode)
|
||||
RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enabledElements, int count, int *scrollIndex, int *active, bool editMode)
|
||||
{
|
||||
#define LISTVIEW_LINE_THICK 1
|
||||
|
||||
bool enableList = false;
|
||||
if (enableElements != NULL) enableList = true;
|
||||
bool usingEnableList = false;
|
||||
if (enabledElements != NULL) usingEnableList = true;
|
||||
|
||||
GuiControlState state = guiState;
|
||||
|
||||
bool pressed = false;
|
||||
|
||||
static int startIndex = 0;
|
||||
int startIndex = *scrollIndex;
|
||||
bool useScrollBar = true;
|
||||
bool pressedKey = false;
|
||||
|
||||
int visibleElements = bounds.height/(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]);
|
||||
if ((startIndex < 0) || (startIndex > count - visibleElements)) startIndex = 0;
|
||||
int endIndex = startIndex + visibleElements;
|
||||
|
||||
int auxActive = *active;
|
||||
|
||||
float barHeight = bounds.height;
|
||||
float minBarHeight = 10;
|
||||
float barPosY = 0;
|
||||
float barPosY = 0;
|
||||
|
||||
// Update control
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
// All the elements fit inside ListView and dont need scrollbar.
|
||||
if (visibleElements >= count)
|
||||
{
|
||||
@ -3112,9 +2929,6 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
endIndex = count;
|
||||
}
|
||||
|
||||
|
||||
// Update control
|
||||
//--------------------------------------------------------------------
|
||||
if ((state != DISABLED) && !guiLocked) // && !guiLocked
|
||||
{
|
||||
Vector2 mousePoint = GetMousePosition();
|
||||
@ -3143,7 +2957,7 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
pressedKey = true;
|
||||
}
|
||||
|
||||
if (useScrollBar)
|
||||
if (useScrollBar && CheckCollisionPointRec(mousePoint, bounds))
|
||||
{
|
||||
endIndex = startIndex + visibleElements;
|
||||
int wheel = GetMouseWheelMove();
|
||||
@ -3169,7 +2983,7 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
}
|
||||
// ------------------------------------------------------------------------------------
|
||||
|
||||
// Note: Changing editMode
|
||||
// Note: Changing editMode
|
||||
if (!editMode)
|
||||
{
|
||||
if (CheckCollisionPointRec(mousePoint, bounds))
|
||||
@ -3202,8 +3016,10 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
{
|
||||
float percentVisible = (endIndex - startIndex)*100/count;
|
||||
barHeight *= percentVisible/100;
|
||||
|
||||
if (barHeight < minBarHeight) barHeight = minBarHeight;
|
||||
else if (barHeight > bounds.height) barHeight = bounds.height;
|
||||
|
||||
// Posición Y a la que dibujamos la barra.
|
||||
barPosY = bounds.y + startIndex*((bounds.height - barHeight)/(count - (endIndex - startIndex)));
|
||||
}
|
||||
@ -3223,26 +3039,6 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
elementWidth = bounds.width - 2*style[LISTVIEW_ELEMENTS_PADDING] - LISTVIEW_LINE_THICK;
|
||||
}
|
||||
|
||||
// Draw GuiListElements
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (enableList && enableElements[i] == 0)
|
||||
{
|
||||
GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (i == auxActive && editMode)
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, true) == false) auxActive = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, true) == true) auxActive = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Draw scrollBar background
|
||||
if (useScrollBar) DrawRectangle(bounds.x, bounds.y, style[LISTVIEW_BAR_WIDTH], bounds.height, Fade(GetColor(style[DEFAULT_BORDER_COLOR_DISABLED]), guiAlpha));
|
||||
|
||||
@ -3254,30 +3050,76 @@ RAYGUIDEF bool GuiListViewEx(Rectangle bounds, const char **text, int *enableEle
|
||||
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);
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (usingEnableList && enabledElements[i] == 0)
|
||||
{
|
||||
GuiDisable();
|
||||
GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
GuiEnable();
|
||||
}
|
||||
else if (i == auxActive) GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, false);
|
||||
else GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, 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);
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (usingEnableList && enabledElements[i] == 0)
|
||||
{
|
||||
GuiDisable();
|
||||
GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
GuiEnable();
|
||||
}
|
||||
else if (i == auxActive) GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, false);
|
||||
else GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
}
|
||||
} break;
|
||||
case PRESSED:
|
||||
{
|
||||
if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[SLIDERBAR_BASE_COLOR_PRESSED]), guiAlpha));
|
||||
DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_PRESSED]), guiAlpha));
|
||||
|
||||
// Draw GuiListElements
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (usingEnableList && enabledElements[i] == 0)
|
||||
{
|
||||
GuiDisable();
|
||||
GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
GuiEnable();
|
||||
}
|
||||
else if (i == auxActive && editMode)
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, true) == false) auxActive = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, true) == true) auxActive = i;
|
||||
}
|
||||
}
|
||||
} break;
|
||||
case DISABLED:
|
||||
{
|
||||
if (useScrollBar) DrawRectangle(bounds.x, barPosY, style[LISTVIEW_BAR_WIDTH], barHeight, Fade(GetColor(style[LISTVIEW_BASE_COLOR_DISABLED]), guiAlpha));
|
||||
|
||||
DrawRectangleLinesEx(bounds, LISTVIEW_LINE_THICK, Fade(GetColor(style[LISTVIEW_BORDER_COLOR_DISABLED]), guiAlpha));
|
||||
|
||||
// Draw GuiListElements
|
||||
for (int i = startIndex; i < endIndex; i++)
|
||||
{
|
||||
if (i == auxActive) GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], true, false);
|
||||
else GuiListElement((Rectangle){ posX, bounds.y + style[LISTVIEW_ELEMENTS_PADDING] + LISTVIEW_LINE_THICK + (i - startIndex)*(style[LISTVIEW_ELEMENTS_HEIGHT] + style[LISTVIEW_ELEMENTS_PADDING]), elementWidth, style[LISTVIEW_ELEMENTS_HEIGHT] }, text[i], false, false);
|
||||
}
|
||||
} break;
|
||||
default: break;
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
*scrollIndex = startIndex;
|
||||
*active = auxActive;
|
||||
return pressed;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user