mirror of
https://github.com/raysan5/raygui.git
synced 2026-02-04 05:09:18 -05:00
ADDED: GuiListView*() property LIST_ITEMS_BORDER_NORMAL
Allows creating list view with items outlined on normal state (not only when focused/selected)
This commit is contained in:
@ -246,8 +246,10 @@ int main()
|
|||||||
if (GuiDropdownBox((Rectangle){ 25, 25, 125, 30 }, "ONE;TWO;THREE", &dropdownBox000Active, dropDown000EditMode)) dropDown000EditMode = !dropDown000EditMode;
|
if (GuiDropdownBox((Rectangle){ 25, 25, 125, 30 }, "ONE;TWO;THREE", &dropdownBox000Active, dropDown000EditMode)) dropDown000EditMode = !dropDown000EditMode;
|
||||||
|
|
||||||
// Second GUI column
|
// Second GUI column
|
||||||
|
//GuiSetStyle(LISTVIEW, LIST_ITEMS_BORDER_NORMAL, 1);
|
||||||
GuiListView((Rectangle){ 165, 25, 140, 124 }, "Charmander;Bulbasaur;#18#Squirtel;Pikachu;Eevee;Pidgey", &listViewScrollIndex, &listViewActive);
|
GuiListView((Rectangle){ 165, 25, 140, 124 }, "Charmander;Bulbasaur;#18#Squirtel;Pikachu;Eevee;Pidgey", &listViewScrollIndex, &listViewActive);
|
||||||
GuiListViewEx((Rectangle){ 165, 162, 140, 184 }, listViewExList, 8, &listViewExScrollIndex, &listViewExActive, &listViewExFocus);
|
GuiListViewEx((Rectangle){ 165, 162, 140, 184 }, listViewExList, 8, &listViewExScrollIndex, &listViewExActive, &listViewExFocus);
|
||||||
|
GuiSetStyle(LISTVIEW, LIST_ITEMS_BORDER_NORMAL, 0);
|
||||||
|
|
||||||
//GuiToggle((Rectangle){ 165, 400, 140, 25 }, "#1#ONE", &toggleGroupActive);
|
//GuiToggle((Rectangle){ 165, 400, 140, 25 }, "#1#ONE", &toggleGroupActive);
|
||||||
GuiToggleGroup((Rectangle){ 165, 360, 140, 24 }, "#1#ONE\n#3#TWO\n#8#THREE\n#23#", &toggleGroupActive);
|
GuiToggleGroup((Rectangle){ 165, 360, 140, 24 }, "#1#ONE\n#3#TWO\n#8#THREE\n#23#", &toggleGroupActive);
|
||||||
|
|||||||
@ -660,6 +660,7 @@ typedef enum {
|
|||||||
LIST_ITEMS_SPACING, // ListView items separation
|
LIST_ITEMS_SPACING, // ListView items separation
|
||||||
SCROLLBAR_WIDTH, // ListView scrollbar size (usually width)
|
SCROLLBAR_WIDTH, // ListView scrollbar size (usually width)
|
||||||
SCROLLBAR_SIDE, // ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE)
|
SCROLLBAR_SIDE, // ListView scrollbar side (0-SCROLLBAR_LEFT_SIDE, 1-SCROLLBAR_RIGHT_SIDE)
|
||||||
|
LIST_ITEMS_BORDER_NORMAL, // ListView items border enabled in normal state
|
||||||
LIST_ITEMS_BORDER_WIDTH // ListView items border width
|
LIST_ITEMS_BORDER_WIDTH // ListView items border width
|
||||||
} GuiListViewProperty;
|
} GuiListViewProperty;
|
||||||
|
|
||||||
@ -3488,7 +3489,7 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollInd
|
|||||||
// Draw visible items
|
// Draw visible items
|
||||||
for (int i = 0; ((i < visibleItems) && (text != NULL)); i++)
|
for (int i = 0; ((i < visibleItems) && (text != NULL)); i++)
|
||||||
{
|
{
|
||||||
GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, LIST_ITEMS_BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_NORMAL)), BLANK);
|
if (GuiGetStyle(LISTVIEW, LIST_ITEMS_BORDER_NORMAL)) GuiDrawRectangle(itemBounds, GuiGetStyle(LISTVIEW, LIST_ITEMS_BORDER_WIDTH), GetColor(GuiGetStyle(LISTVIEW, BORDER_COLOR_NORMAL)), BLANK);
|
||||||
|
|
||||||
if (state == STATE_DISABLED)
|
if (state == STATE_DISABLED)
|
||||||
{
|
{
|
||||||
@ -3512,7 +3513,7 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollInd
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Draw item normal
|
// Draw item normal (no rectangle)
|
||||||
GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_NORMAL)));
|
GuiDrawText(text[startIndex + i], GetTextBounds(DEFAULT, itemBounds), GuiGetStyle(LISTVIEW, TEXT_ALIGNMENT), GetColor(GuiGetStyle(LISTVIEW, TEXT_COLOR_NORMAL)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4331,6 +4332,7 @@ void GuiLoadStyleDefault(void)
|
|||||||
GuiSetStyle(SCROLLBAR, SCROLL_SPEED, 12);
|
GuiSetStyle(SCROLLBAR, SCROLL_SPEED, 12);
|
||||||
GuiSetStyle(LISTVIEW, LIST_ITEMS_HEIGHT, 28);
|
GuiSetStyle(LISTVIEW, LIST_ITEMS_HEIGHT, 28);
|
||||||
GuiSetStyle(LISTVIEW, LIST_ITEMS_SPACING, 2);
|
GuiSetStyle(LISTVIEW, LIST_ITEMS_SPACING, 2);
|
||||||
|
GuiSetStyle(LISTVIEW, LIST_ITEMS_BORDER_WIDTH, 1);
|
||||||
GuiSetStyle(LISTVIEW, SCROLLBAR_WIDTH, 12);
|
GuiSetStyle(LISTVIEW, SCROLLBAR_WIDTH, 12);
|
||||||
GuiSetStyle(LISTVIEW, SCROLLBAR_SIDE, SCROLLBAR_RIGHT_SIDE);
|
GuiSetStyle(LISTVIEW, SCROLLBAR_SIDE, SCROLLBAR_RIGHT_SIDE);
|
||||||
GuiSetStyle(COLORPICKER, COLOR_SELECTOR_SIZE, 8);
|
GuiSetStyle(COLORPICKER, COLOR_SELECTOR_SIZE, 8);
|
||||||
|
|||||||
Reference in New Issue
Block a user