From 33866a53f21927605dc9f9bbcc90c2ff77899af2 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Wed, 24 Mar 2021 22:25:13 +0100 Subject: [PATCH] Part 2. --- source/gui/gfx.cpp | 4 ++-- source/menu/settings.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/gui/gfx.cpp b/source/gui/gfx.cpp index fde4481..8cc0604 100644 --- a/source/gui/gfx.cpp +++ b/source/gui/gfx.cpp @@ -89,7 +89,7 @@ void GFX::DrawSprite(int img, int x, int y, float ScaleX, float ScaleY) { bool selected: if checked, or not. */ void GFX::DrawCheckbox(float xPos, float yPos, bool selected) { - GFX::DrawIcon((selected ? sprites_checked_idx : sprites_unchecked_idx), xPos, yPos, UIThemes->TextColor(), 0.5f); + GFX::DrawIcon((selected ? sprites_checked_idx : sprites_unchecked_idx), xPos, yPos, UIThemes->TextColor(), 1.0f); } /* @@ -100,7 +100,7 @@ void GFX::DrawCheckbox(float xPos, float yPos, bool selected) { bool toggled: If toggled or not. */ void GFX::DrawToggle(float xPos, float yPos, bool toggled) { - GFX::DrawIcon((toggled ? sprites_toggle_on_idx : sprites_toggle_off_idx), xPos, yPos, UIThemes->TextColor(), 0.5f); + GFX::DrawSprite((toggled ? sprites_toggle_on_idx : sprites_toggle_off_idx), xPos, yPos); } void GFX::DrawTime() { diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp index 84706f2..df01c7c 100644 --- a/source/menu/settings.cpp +++ b/source/menu/settings.cpp @@ -136,7 +136,7 @@ static void DrawLanguageSettings(int selection, int sPos) { static void DrawSettingsDir(int selection) { Gui::Draw_Rect(40, 0, 280, 25, UIThemes->EntryBar()); Gui::Draw_Rect(40, 25, 280, 1, UIThemes->EntryOutline()); - GFX::DrawSprite(sprites_arrow_idx, back.x, back.y); + GFX::DrawIcon(sprites_arrow_idx, back.x, back.y, UIThemes->TextColor(), 1.0f); Gui::DrawStringCentered(20, 2, 0.6, UIThemes->TextColor(), Lang::get("DIRECTORY_SETTINGS"), 248, 0, font); for (int i = 0; i < (int)dirButtons.size(); i++) { @@ -146,7 +146,7 @@ static void DrawSettingsDir(int selection) { GFX::DrawToggle(dirIcons[i].x, dirIcons[i].y, config->_3dsxInFolder()); Gui::DrawString(dirButtons[i].x + 4, dirButtons[i].y + 28, 0.4f, UIThemes->TextColor(), Lang::get("3DSX_IN_FOLDER_DESC"), 265, 0, font, C2D_WordWrap); } else { - GFX::DrawIcon(sprites_arrow_idx, dirIcons[i].x, dirIcons[i].y, UIThemes->TextColor(), -1.0f); + GFX::DrawIcon(sprites_arrow_idx, dirIcons[i].x, dirIcons[i].y, UIThemes->TextColor(), 1.0f, -1.0f); } } }