From 4322e0d80815fe6dc54fa1c262e9eb584bda5440 Mon Sep 17 00:00:00 2001 From: JC Date: Sat, 5 Oct 2024 18:27:31 -0700 Subject: [PATCH] bugfix icon layout main screen --- application/lucre/UI/common.cpp | 8 ++--- application/lucre/UI/mainScreen.cpp | 48 ++++++++++++++--------------- engine/gui/Common/UI/viewGroup.cpp | 40 ++++++++++++------------ 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/application/lucre/UI/common.cpp b/application/lucre/UI/common.cpp index 77d5392d..7718b2ae 100644 --- a/application/lucre/UI/common.cpp +++ b/application/lucre/UI/common.cpp @@ -35,8 +35,8 @@ namespace LucreApp m_ScaleAll = m_AvailableHeight / 1080.0f; - m_IconWidth = 128.0f * m_ScaleAll; - m_IconHeight = 128.0f * m_ScaleAll; + m_IconWidth = 64.0f * m_ScaleAll; + m_IconHeight = 64.0f * m_ScaleAll; m_IconSpacer = 64.0f * m_ScaleAll; m_StripSize = 150.0f * m_ScaleAll; @@ -50,8 +50,8 @@ namespace LucreApp m_ControllerScale = 1.0f * m_ScaleAll; m_TabIconScaleRetro = 1.5 * m_ScaleAll; - m_IconScaleRetro = 1.0 * m_ScaleAll; - m_IconScale = 2.0 * m_ScaleAll; + m_IconScaleRetro = 0.5 * m_ScaleAll; + m_IconScale = 1.0 * m_ScaleAll; } void Common::OnResize() { Init(); } diff --git a/application/lucre/UI/mainScreen.cpp b/application/lucre/UI/mainScreen.cpp index 34170901..a148ac8a 100644 --- a/application/lucre/UI/mainScreen.cpp +++ b/application/lucre/UI/mainScreen.cpp @@ -113,8 +113,8 @@ namespace LucreApp verticalLayout->Add(topline); topline->Add(new SCREEN_UI::Spacer(UI::g_Common->m_MarginLeftRight, 0.0f)); - float horizontalSpacerTopline = UI::g_Common->m_AvailableWidth - 6 * UI::g_Common->m_IconWidth - - 4 * UI::g_Common->m_IconSpacer - 2 * UI::g_Common->m_MarginLeftRight; + float horizontalSpacerTopline = UI::g_Common->m_AvailableWidth - 7 * UI::g_Common->m_IconWidth - + 5 * UI::g_Common->m_IconSpacer - 2 * UI::g_Common->m_MarginLeftRight; Sprite2D icon; Sprite2D icon_active; @@ -124,11 +124,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetScene1Button.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetScene1Button.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetScene1Button.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_Scene1Button = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -147,11 +147,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetScene2Button.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetScene2Button.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetScene2Button.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_Scene2Button = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -170,11 +170,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetScene3Button.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetScene3Button.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetScene3Button.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_Scene3Button = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -183,7 +183,7 @@ namespace LucreApp { icon = Sprite2D(m_Spritesheet->GetSprite(I_GEAR)); icon.SetScale(UI::g_Common->m_IconScale); - m_Scene2Button = new SCREEN_UI::Choice(icon, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); + m_Scene3Button = new SCREEN_UI::Choice(icon, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); } m_Scene3Button->OnClick.Handle(this, &MainScreen::Scene3Click); topline->Add(m_Scene3Button); @@ -193,11 +193,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetScene4Button.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetScene4Button.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetScene4Button.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_Scene4Button = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -206,7 +206,7 @@ namespace LucreApp { icon = Sprite2D(m_Spritesheet->GetSprite(I_GEAR)); icon.SetScale(UI::g_Common->m_IconScale); - m_Scene2Button = new SCREEN_UI::Choice(icon, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); + m_Scene4Button = new SCREEN_UI::Choice(icon, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); } m_Scene4Button->OnClick.Handle(this, &MainScreen::Scene4Click); topline->Add(m_Scene4Button); @@ -216,11 +216,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetScene5Button.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetScene5Button.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetScene5Button.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_Scene5Button = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -238,11 +238,11 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetSettings.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetSettings.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetSettings.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); - icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_SettingsButton = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, new SCREEN_UI::LayoutParams(icon.GetWidth(), icon.GetHeight())); @@ -276,9 +276,9 @@ namespace LucreApp if (CoreSettings::m_UITheme == THEME_RETRO) { icon = Sprite2D(m_SpritesheetOff.GetSprite(BUTTON_4_STATES_NOT_FOCUSED)); - icon.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon.SetScale(UI::g_Common->m_IconScaleRetro); icon_active = Sprite2D(m_SpritesheetOff.GetSprite(BUTTON_4_STATES_FOCUSED)); - icon_active.SetScale(UI::g_Common->m_IconScaleRetro * 0.5f); + icon_active.SetScale(UI::g_Common->m_IconScaleRetro); icon_depressed = Sprite2D(m_SpritesheetOff.GetSprite(BUTTON_4_STATES_FOCUSED_DEPRESSED)); icon_depressed.SetScale(UI::g_Common->m_IconScaleRetro); m_OffButton = new SCREEN_UI::Choice(icon, icon_active, icon_depressed, diff --git a/engine/gui/Common/UI/viewGroup.cpp b/engine/gui/Common/UI/viewGroup.cpp index 82ac7326..60455e1a 100644 --- a/engine/gui/Common/UI/viewGroup.cpp +++ b/engine/gui/Common/UI/viewGroup.cpp @@ -80,7 +80,7 @@ namespace GfxRenderEngine void ViewGroup::RemoveSubview(View* view) { std::lock_guard guard(modifyLock_); - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i] == view) { @@ -94,7 +94,7 @@ namespace GfxRenderEngine void ViewGroup::Clear() { std::lock_guard guard(modifyLock_); - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { delete views_[i]; views_[i] = nullptr; @@ -112,7 +112,7 @@ namespace GfxRenderEngine tag = anonId; } - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { views_[i]->PersistData(status, tag + "/" + SCREEN_StringFromInt((int)i), storage); } @@ -242,7 +242,7 @@ namespace GfxRenderEngine std::lock_guard guard(modifyLock_); if (!CanBeFocused() && !views_.empty()) { - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i]->SetFocus()) return true; @@ -253,7 +253,7 @@ namespace GfxRenderEngine bool ViewGroup::SubviewFocused(View* view) { - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i] == view) return true; @@ -425,7 +425,7 @@ namespace GfxRenderEngine } int num = -1; - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i] == view) { @@ -455,7 +455,7 @@ namespace GfxRenderEngine case FOCUS_RIGHT: case FOCUS_DOWN: { - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i] == view) { @@ -510,7 +510,7 @@ namespace GfxRenderEngine { continue; } - numVisible++; + ++numVisible; const LinearLayoutParams* linLayoutParams = view->GetLayoutParams()->As(); @@ -703,7 +703,7 @@ namespace GfxRenderEngine itemBounds.w = measuredWidth_; } - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { if (views_[i]->GetVisibility() == V_GONE) { @@ -1155,7 +1155,7 @@ namespace GfxRenderEngine void AnchorLayout::MeasureViews(const SCREEN_UIContext& dc, MeasureSpec horiz, MeasureSpec vert) { - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { Size width = WRAP_CONTENT; Size height = WRAP_CONTENT; @@ -1217,7 +1217,7 @@ namespace GfxRenderEngine void AnchorLayout::Layout() { - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { const AnchorLayoutParams* params = views_[i]->GetLayoutParams()->As(); @@ -1287,7 +1287,7 @@ namespace GfxRenderEngine { MeasureSpecType measureType = settings_.fillCells ? EXACTLY : AT_MOST; - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { views_[i]->Measure(dc, MeasureSpec(measureType, settings_.columnWidth), MeasureSpec(measureType, settings_.rowHeight)); @@ -1310,7 +1310,7 @@ namespace GfxRenderEngine int y = 0; int x = 0; int count = 0; - for (size_t i = 0; i < views_.size(); i++) + for (size_t i = 0; i < views_.size(); ++i) { Bounds itemBounds, innerBounds; @@ -1325,7 +1325,7 @@ namespace GfxRenderEngine views_[i]->SetBounds(innerBounds); views_[i]->Layout(); - count++; + ++count; if (count == numColumns_) { count = 0; @@ -1522,7 +1522,7 @@ namespace GfxRenderEngine void ChoiceStrip::enableAllTabs() { - for (unsigned int choice = 0; choice < (unsigned int)views_.size(); choice++) + for (unsigned int choice = 0; choice < (unsigned int)views_.size(); ++choice) { Choice(choice)->SetEnabled(true); } @@ -1530,7 +1530,7 @@ namespace GfxRenderEngine void ChoiceStrip::disableAllTabs() { - for (unsigned int choice = 0; choice < (unsigned int)views_.size(); choice++) + for (unsigned int choice = 0; choice < (unsigned int)views_.size(); ++choice) { Choice(choice)->SetEnabled(false); } @@ -1541,7 +1541,7 @@ namespace GfxRenderEngine bool ChoiceStrip::AnyTabHasFocus(int& tab) { bool anyTabHasFocus = false; - for (unsigned int choice = 0; choice < (unsigned int)views_.size(); choice++) + for (unsigned int choice = 0; choice < (unsigned int)views_.size(); ++choice) { if (Choice(choice)->HasFocus()) { @@ -1582,7 +1582,7 @@ namespace GfxRenderEngine bool ChoiceStrip::Touch(const SCREEN_TouchInput& input) { bool clicked = false; - for (unsigned int choice = 0; choice < (unsigned int)views_.size(); choice++) + for (unsigned int choice = 0; choice < (unsigned int)views_.size(); ++choice) { bool isEnabled = Choice(choice)->IsEnabled(); Choice(choice)->SetEnabled(true); @@ -1594,7 +1594,7 @@ namespace GfxRenderEngine EventReturn ChoiceStrip::OnChoiceClick(EventParams& e) { - for (int i = 0; i < (int)views_.size(); i++) + for (int i = 0; i < (int)views_.size(); ++i) { if (views_[i] != e.v) { @@ -1711,7 +1711,7 @@ namespace GfxRenderEngine void ListView::CreateAllItems() { linLayout_->Clear(); - for (int i = 0; i < adaptor_->GetNumItems(); i++) + for (int i = 0; i < adaptor_->GetNumItems(); ++i) { if (hidden_.find(i) == hidden_.end()) {