OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweek popup_list height to match qlaunch, change white/abyss scrollbar colour, fix menu using text instead of line colours

Browse Source
This commit is contained in:
ITotalJustice
2025-01-09 19:34:16 +00:00
parent abc7a0799d
commit 91a08d36b4
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/romfs/themes/abyss_theme.ini
View File

@@ -8,7 +8,16 @@ inherit=romfs:/themes/base_black_theme.ini
background = 0x0f111a background = 0x0f111a
grid = 0x0f115c30 grid = 0x0f115c30
popup = 0x0f115c popup = 0x0f115c
line = 0xffbc41
line_seperator = 0xffbc41
text = 0xffbc41 text = 0xffbc41
text_info = 0xffbc41 text_info = 0xffbc41
text_selected = 0x529cff text_selected = 0x529cff
selected_background = 0x0f115c selected_background = 0x0f115c
scrollbar = 0x3250f0
scrollbar_background = ; hide the background
progressbar = 0x3250f0

2
assets/romfs/themes/base_white_theme.ini
View File

@@ -14,7 +14,7 @@ selected_background = 0xfdfdfd
sidebar = 0xe2e2e2f5 sidebar = 0xe2e2e2f5
scrollbar = 0x3250f0 scrollbar = 0xB0B0B0
scrollbar_background = ; hide the background scrollbar_background = ; hide the background
; scrollbar_background = 0xababab ; scrollbar_background = 0xababab

4
sphaira/source/ui/menus/menu_base.cpp
View File

@@ -58,8 +58,8 @@ void MenuBase::Draw(NVGcontext* vg, Theme* theme) {
#undef draw #undef draw
gfx::drawRect(vg, 30.f, 86.f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_TEXT)); gfx::drawRect(vg, 30.f, 86.f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_LINE));
gfx::drawRect(vg, 30.f, 646.0f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_TEXT)); gfx::drawRect(vg, 30.f, 646.0f, 1220.f, 1.f, theme->GetColour(ThemeEntryID_LINE));
nvgFontSize(vg, 28); nvgFontSize(vg, 28);
gfx::textBounds(vg, 0, 0, bounds, m_title.c_str()); gfx::textBounds(vg, 0, 0, bounds, m_title.c_str());

2
sphaira/source/ui/popup_list.cpp
View File

@@ -84,7 +84,7 @@ PopupList::PopupList(std::string title, Items items, Callback cb, s64 index)
); );
m_pos.w = 1280.f; m_pos.w = 1280.f;
const float a = std::min(380.f, (60.f * static_cast<float>(m_items.size()))); const float a = std::min(370.f, (60.f * static_cast<float>(m_items.size())));
m_pos.h = 80.f + 140.f + a; m_pos.h = 80.f + 140.f + a;
m_pos.y = 720.f - m_pos.h; m_pos.y = 720.f - m_pos.h;
m_line_top = m_pos.y + 70.f; m_line_top = m_pos.y + 70.f;