@@ -1611,9 +1611,7 @@ int GuiWindowBox(Rectangle bounds, const char *title)
16111611 const float vPadding = statusBarHeight /2.0f - RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT /2.0f ;
16121612 Rectangle windowPanel = { bounds .x , bounds .y + (float )statusBarHeight - 1 , bounds .width , bounds .height - (float )statusBarHeight + 1 };
16131613 Rectangle closeButtonRec = { statusBar .x + statusBar .width - GuiGetStyle (STATUSBAR , BORDER_WIDTH ) - RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT - vPadding ,
1614- statusBar .y + vPadding ,
1615- RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT ,
1616- RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT };
1614+ statusBar .y + vPadding , RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT , RAYGUI_WINDOWBOX_CLOSEBUTTON_HEIGHT };
16171615
16181616 // Update control
16191617 //--------------------------------------------------------------------
@@ -3494,7 +3492,7 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollInd
34943492
34953493 if (state == STATE_DISABLED )
34963494 {
3497- if ((startIndex + i ) == itemSelected ) GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_DISABLED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_DISABLED )));
3495+ if ((startIndex + i ) == itemSelected ) GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , LIST_ITEMS_BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_DISABLED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_DISABLED )));
34983496
34993497 GuiDrawText (text [startIndex + i ], GetTextBounds (DEFAULT , itemBounds ), GuiGetStyle (LISTVIEW , TEXT_ALIGNMENT ), GetColor (GuiGetStyle (LISTVIEW , TEXT_COLOR_DISABLED )));
35003498 }
@@ -3503,13 +3501,13 @@ int GuiListViewEx(Rectangle bounds, const char **text, int count, int *scrollInd
35033501 if (((startIndex + i ) == itemSelected ) && (active != NULL ))
35043502 {
35053503 // Draw item selected
3506- GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_PRESSED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_PRESSED )));
3504+ GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , LIST_ITEMS_BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_PRESSED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_PRESSED )));
35073505 GuiDrawText (text [startIndex + i ], GetTextBounds (DEFAULT , itemBounds ), GuiGetStyle (LISTVIEW , TEXT_ALIGNMENT ), GetColor (GuiGetStyle (LISTVIEW , TEXT_COLOR_PRESSED )));
35083506 }
35093507 else if (((startIndex + i ) == itemFocused )) // && (focus != NULL)) // NOTE: We want items focused, despite not returned!
35103508 {
35113509 // Draw item focused
3512- GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_FOCUSED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_FOCUSED )));
3510+ GuiDrawRectangle (itemBounds , GuiGetStyle (LISTVIEW , LIST_ITEMS_BORDER_WIDTH ), GetColor (GuiGetStyle (LISTVIEW , BORDER_COLOR_FOCUSED )), GetColor (GuiGetStyle (LISTVIEW , BASE_COLOR_FOCUSED )));
35133511 GuiDrawText (text [startIndex + i ], GetTextBounds (DEFAULT , itemBounds ), GuiGetStyle (LISTVIEW , TEXT_ALIGNMENT ), GetColor (GuiGetStyle (LISTVIEW , TEXT_COLOR_FOCUSED )));
35143512 }
35153513 else
0 commit comments