twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2025-12-25 10:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Consider tabs out of screen bounds

Browse Source 
Avoid drawing tabs out of screen
This commit is contained in:
Ray
2022-11-22 17:09:11 +01:00
parent bd4d2d860c
commit 85d6736be9
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/raygui.h
View File

@ -1495,34 +1495,42 @@ int GuiTabBar(Rectangle bounds, const char **text, int count, int *active)
if (*active < 0) *active = 0; if (*active < 0) *active = 0;
else if (*active > count - 1) *active = count - 1; else if (*active > count - 1) *active = count - 1;
int offsetX = 0; // Required in case tabs go out of screen
offsetX = (*active + 2)*RAYGUI_TABBAR_ITEM_WIDTH - GetScreenWidth();
if (offsetX < 0) offsetX = 0;
// Draw control // Draw control
//-------------------------------------------------------------------- //--------------------------------------------------------------------
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
tabBounds.x = bounds.x + (RAYGUI_TABBAR_ITEM_WIDTH + 4)*i; tabBounds.x = bounds.x + (RAYGUI_TABBAR_ITEM_WIDTH + 4)*i - offsetX;
int textAlignment = GuiGetStyle(TOGGLE, TEXT_ALIGNMENT); if (tabBounds.x < GetScreenWidth())
int textPadding = GuiGetStyle(TOGGLE, TEXT_PADDING); {
GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT); // Draw tabs as toggle controls
GuiSetStyle(TOGGLE, TEXT_PADDING, 8); int textAlignment = GuiGetStyle(TOGGLE, TEXT_ALIGNMENT);
if (i == *active) GuiToggle(tabBounds, GuiIconText(12, text[i]), true); int textPadding = GuiGetStyle(TOGGLE, TEXT_PADDING);
else if (GuiToggle(tabBounds, GuiIconText(12, text[i]), false) == true) *active = i; GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, TEXT_ALIGN_LEFT);
GuiSetStyle(TOGGLE, TEXT_PADDING, textPadding); GuiSetStyle(TOGGLE, TEXT_PADDING, 8);
GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, textAlignment); if (i == *active) GuiToggle(tabBounds, GuiIconText(12, text[i]), true);
else if (GuiToggle(tabBounds, GuiIconText(12, text[i]), false) == true) *active = i;
GuiSetStyle(TOGGLE, TEXT_PADDING, textPadding);
GuiSetStyle(TOGGLE, TEXT_ALIGNMENT, textAlignment);
// Draw tab close button // Draw tab close button
// NOTE: Only draw close button for curren tab: if (CheckCollisionPointRec(mousePoint, tabBounds)) // NOTE: Only draw close button for curren tab: if (CheckCollisionPointRec(mousePoint, tabBounds))
int tempBorderWidth = GuiGetStyle(BUTTON, BORDER_WIDTH); int tempBorderWidth = GuiGetStyle(BUTTON, BORDER_WIDTH);
int tempTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT); int tempTextAlignment = GuiGetStyle(BUTTON, TEXT_ALIGNMENT);
GuiSetStyle(BUTTON, BORDER_WIDTH, 1); GuiSetStyle(BUTTON, BORDER_WIDTH, 1);
GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER);
#if defined(RAYGUI_NO_ICONS) #if defined(RAYGUI_NO_ICONS)
if (GuiButton(closeButtonRec, "x")) closing = i; if (GuiButton(closeButtonRec, "x")) closing = i;
#else #else
if (GuiButton(RAYGUI_CLITERAL(Rectangle){ tabBounds.x + tabBounds.width - 14 - 5, tabBounds.y + 5, 14, 14 }, GuiIconText(ICON_CROSS_SMALL, NULL))) closing = i; if (GuiButton(RAYGUI_CLITERAL(Rectangle){ tabBounds.x + tabBounds.width - 14 - 5, tabBounds.y + 5, 14, 14 }, GuiIconText(ICON_CROSS_SMALL, NULL))) closing = i;
#endif #endif
GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth); GuiSetStyle(BUTTON, BORDER_WIDTH, tempBorderWidth);
GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlignment); GuiSetStyle(BUTTON, TEXT_ALIGNMENT, tempTextAlignment);
}
} }
GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, bounds.width, 1 }, 0, BLANK, GetColor(GuiGetStyle(TOGGLE, BORDER_COLOR_NORMAL))); GuiDrawRectangle(RAYGUI_CLITERAL(Rectangle){ bounds.x, bounds.y + bounds.height - 1, bounds.width, 1 }, 0, BLANK, GetColor(GuiGetStyle(TOGGLE, BORDER_COLOR_NORMAL)));