From 1f920bf264c5e5d8787a6470114a4edebd45922b Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 2 Jun 2022 19:56:21 +0200 Subject: [PATCH] REVIEWED: guiIconScale #196 --- examples/style_selector/style_selector.c | 6 +++++- projects/VS2022/examples/style_selector.vcxproj | 4 ++-- src/raygui.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/style_selector/style_selector.c b/examples/style_selector/style_selector.c index 654b826..9bb2bbc 100644 --- a/examples/style_selector/style_selector.c +++ b/examples/style_selector/style_selector.c @@ -176,11 +176,15 @@ int main() ClearBackground(GetColor(GuiGetStyle(DEFAULT, BACKGROUND_COLOR))); - // Visuals options GuiLabel((Rectangle){ 10, 10, 60, 24 }, "Style:"); visualStyleActive = GuiComboBox((Rectangle){ 60,10, 120, 24 }, "default;Jungle;Lavanda;Dark;Bluish;Cyber;Terminal", visualStyleActive); + GuiSetIconScale(2.0f); + GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_RIGHT); + GuiButton((Rectangle){ 25, 255, 300, 30 }, GuiIconText(ICON_FILE_SAVE, "Save File")); + GuiSetStyle(BUTTON, TEXT_ALIGNMENT, TEXT_ALIGN_CENTER); + /* // raygui: controls drawing //---------------------------------------------------------------------------------- diff --git a/projects/VS2022/examples/style_selector.vcxproj b/projects/VS2022/examples/style_selector.vcxproj index d2b80a4..02b5bae 100644 --- a/projects/VS2022/examples/style_selector.vcxproj +++ b/projects/VS2022/examples/style_selector.vcxproj @@ -171,7 +171,7 @@ Level3 Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP%(PreprocessorDefinitions) - CompileAsCpp + CompileAsC $(SolutionDir)..\..\src;$(SolutionDir)..\..\src\external;$(SolutionDir)..\..\..\raylib\src;%(AdditionalIncludeDirectories) @@ -188,7 +188,7 @@ Level3 Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;VERSION_ONE;%(PreprocessorDefinitions) - CompileAsCpp + CompileAsC $(SolutionDir)..\..\src;$(SolutionDir)..\..\src\external;$(SolutionDir)..\..\..\raylib\src;%(AdditionalIncludeDirectories) /FS %(AdditionalOptions) diff --git a/src/raygui.h b/src/raygui.h index e3f46f5..11548b4 100644 --- a/src/raygui.h +++ b/src/raygui.h @@ -3847,7 +3847,7 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color // If text requires an icon, add size to measure if (iconId >= 0) { - textSize.x += RAYGUI_ICON_SIZE; + textSize.x += RAYGUI_ICON_SIZE*guiIconScale; // WARNING: If only icon provided, text could be pointing to EOF character: '\0' if ((text != NULL) && (text[0] != '\0')) textSize.x += ICON_TEXT_PADDING; @@ -3886,8 +3886,8 @@ static void GuiDrawText(const char *text, Rectangle bounds, int alignment, Color if (iconId >= 0) { // NOTE: We consider icon height, probably different than text size - GuiDrawIcon(iconId, (int)position.x, (int)(bounds.y + bounds.height/2 - RAYGUI_ICON_SIZE/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height)), guiIconScale, tint); - position.x += (RAYGUI_ICON_SIZE + ICON_TEXT_PADDING); + GuiDrawIcon(iconId, (int)position.x, (int)(bounds.y + bounds.height/2 - RAYGUI_ICON_SIZE*guiIconScale/2 + TEXT_VALIGN_PIXEL_OFFSET(bounds.height)), guiIconScale, tint); + position.x += (RAYGUI_ICON_SIZE*guiIconScale + ICON_TEXT_PADDING); } #endif DrawTextEx(guiFont, text, position, (float)GuiGetStyle(DEFAULT, TEXT_SIZE), (float)GuiGetStyle(DEFAULT, TEXT_SPACING), tint);