WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Adjust progress bar color scheme, nicer wording

Browse Source
This commit is contained in:
elasota
2020-11-02 22:36:39 -05:00
parent 3b91d0492e
commit 98c217d0bb
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
GpApp/Main.cpp
View File

@@ -378,18 +378,19 @@ void StepLoadScreen(int steps)
{ {
if (loadScreenWindow) if (loadScreenWindow)
{ {
Rect loadScreenProgressBarFillRect = loadScreenProgressBarRect.Inset(1, 1);
int oldProgress = loadScreenProgress; int oldProgress = loadScreenProgress;
int loadScreenMax = 25; int loadScreenMax = 25;
loadScreenProgress = loadScreenProgress + steps; loadScreenProgress = loadScreenProgress + steps;
if (loadScreenProgress > loadScreenMax) if (loadScreenProgress > loadScreenMax)
loadScreenProgress = loadScreenMax; loadScreenProgress = loadScreenMax;
PortabilityLayer::ResolveCachingColor blackColor(StdColors::Black()); PortabilityLayer::ResolveCachingColor fillColor(PortabilityLayer::RGBAColor::Create(51, 51, 51, 255));
int prevStep = oldProgress * loadScreenProgressBarRect.Width() / loadScreenMax; int prevStep = oldProgress * loadScreenProgressBarFillRect.Width() / loadScreenMax;
int thisStep = loadScreenProgress * loadScreenProgressBarRect.Width() / loadScreenMax; int thisStep = loadScreenProgress * loadScreenProgressBarFillRect.Width() / loadScreenMax;
loadScreenWindow->GetDrawSurface()->FillRect(Rect::Create(loadScreenProgressBarRect.top, loadScreenProgressBarRect.left + prevStep, loadScreenProgressBarRect.bottom, loadScreenProgressBarRect.left + thisStep), blackColor); loadScreenWindow->GetDrawSurface()->FillRect(Rect::Create(loadScreenProgressBarFillRect.top, loadScreenProgressBarFillRect.left + prevStep, loadScreenProgressBarFillRect.bottom, loadScreenProgressBarFillRect.left + thisStep), fillColor);
ForceSyncFrame(); ForceSyncFrame();
for (int i = 0; i < steps; i++) for (int i = 0; i < steps; i++)
@@ -416,7 +417,7 @@ void InitLoadingWindow()
if (!isPrefsLoaded) if (!isPrefsLoaded)
{ {
loadingText = PSTR("Performing First-Time Setup..."); loadingText = PSTR("Getting some things ready...");
kLoadScreenWidth = 440; kLoadScreenWidth = 440;
} }
@@ -456,13 +457,16 @@ void InitLoadingWindow()
surface->DrawString(Point::Create(4+16+8, textY), loadingText, blackColor, font); surface->DrawString(Point::Create(4+16+8, textY), loadingText, blackColor, font);
static const int32_t loadBarPadding = 16; static const int32_t loadBarPadding = 16;
static const int32_t loadBarHeight = 10;
int32_t loadBarStartX = static_cast<int32_t>(font->MeasureString(loadingText.UChars(), loadingText.Length())) + 4 + 16 + 8 + loadBarPadding; int32_t loadBarStartX = static_cast<int32_t>(font->MeasureString(loadingText.UChars(), loadingText.Length())) + 4 + 16 + 8 + loadBarPadding;
int32_t loadBarEndX = loadScreenLocalRect.right - loadBarPadding; int32_t loadBarEndX = loadScreenLocalRect.right - loadBarPadding;
loadScreenProgressBarRect = Rect::Create((loadScreenLocalRect.Height() - 8) / 2, loadBarStartX, (loadScreenLocalRect.Height() + 8) / 2, loadBarEndX); loadScreenProgressBarRect = Rect::Create((loadScreenLocalRect.Height() - loadBarHeight) / 2, loadBarStartX, (loadScreenLocalRect.Height() + loadBarHeight) / 2, loadBarEndX);
loadScreenProgress = 0; loadScreenProgress = 0;
PortabilityLayer::ResolveCachingColor partialFillColor(PortabilityLayer::RGBAColor::Create(255, 255, 204, 255));
surface->FrameRect(loadScreenProgressBarRect, blackColor); surface->FrameRect(loadScreenProgressBarRect, blackColor);
surface->FillRect(loadScreenProgressBarRect.Inset(1, 1), partialFillColor);
Rect ringDestRect = Rect::Create(8, 8, 24, 24); Rect ringDestRect = Rect::Create(8, 8, 24, 24);
Rect ringSrcRect = Rect::Create(0, 0, 16, 16); Rect ringSrcRect = Rect::Create(0, 0, 16, 16);