twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-02-01 03:39:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

REVIEW: GetTextBounds() and GuiDrawText()

Browse Source
This commit is contained in:
raysan5
2019-09-01 13:21:18 +02:00
parent 1adfb6cef5
commit 9b68062910
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/raygui.h
View File

@ -614,17 +614,18 @@ static Rectangle GetTextBounds(int control, Rectangle bounds)
{ {
Rectangle textBounds = bounds; Rectangle textBounds = bounds;
// TODO: Consider TEXT_PADDING properly -> combines with TEXT_ALIGNMENT
textBounds.x = bounds.x + GuiGetStyle(control, BORDER_WIDTH); textBounds.x = bounds.x + GuiGetStyle(control, BORDER_WIDTH);
textBounds.y = bounds.y + GuiGetStyle(control, BORDER_WIDTH); textBounds.y = bounds.y + GuiGetStyle(control, BORDER_WIDTH);
textBounds.width = bounds.width - 2*GuiGetStyle(control, BORDER_WIDTH); textBounds.width = bounds.width - 2*GuiGetStyle(control, BORDER_WIDTH);
textBounds.height = bounds.height - 2*GuiGetStyle(control, BORDER_WIDTH); textBounds.height = bounds.height - 2*GuiGetStyle(control, BORDER_WIDTH);
// Consider TEXT_PADDING properly, depends on TEXT_ALIGNMENT
if (GuiGetStyle(control, TEXT_ALIGNMENT) == GUI_TEXT_ALIGN_RIGHT) textBounds.x -= GuiGetStyle(control, TEXT_PADDING);
else textBounds.x += GuiGetStyle(control, TEXT_PADDING);
switch (control) switch (control)
{ {
case COMBOBOX: bounds.width -= (GuiGetStyle(control, COMBO_BUTTON_WIDTH) + GuiGetStyle(control, COMBO_BUTTON_PADDING)); break; case COMBOBOX: bounds.width -= (GuiGetStyle(control, COMBO_BUTTON_WIDTH) + GuiGetStyle(control, COMBO_BUTTON_PADDING)); break;
case CHECKBOX: bounds.x += (bounds.width + GuiGetStyle(control, TEXT_PADDING)); break;
default: break; default: break;
} }
@ -710,6 +711,11 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color
} break; } break;
default: break; default: break;
} }
// NOTE: Make sure we get pixel-perfect coordinates,
// In case of decimals we got weird text positioning
position.x = (float)((int)position.x);
position.y = (float)((int)position.y);
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
// Draw text (with icon if available) // Draw text (with icon if available)