Compare commits
3
Commits
47785cd4b9
...
1.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
400c6a782b | ||
|
|
9b0bd517c6 | ||
|
|
babb74c7ad |
@@ -41,10 +41,17 @@ jobs:
|
||||
# checks is keyed per-system (checks.<system>.default); nix build's
|
||||
# #attr shorthand can't resolve it, so resolve the current system inline.
|
||||
# --impure lets the flake read APP_VERSION via builtins.getEnv
|
||||
# (pure evals always get the package defaults). The offline test suite
|
||||
# runs in the package's checkPhase.
|
||||
# (pure evals always get the package defaults).
|
||||
- name: Build package
|
||||
run: |
|
||||
nix build -L ".#packages.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
|
||||
--impure --out-link result-pkg
|
||||
# The offline test suite runs in the check derivation's checkPhase.
|
||||
# This is a separate build/output from the package itself.
|
||||
- name: Build + offline test suite
|
||||
run: nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" --impure
|
||||
run: |
|
||||
nix build -L ".#checks.$(nix eval --impure --raw --expr 'builtins.currentSystem').default" \
|
||||
--impure --out-link result-checks
|
||||
|
||||
- name: Live portal tests
|
||||
env:
|
||||
@@ -59,10 +66,11 @@ jobs:
|
||||
./build/test_license_service
|
||||
'
|
||||
|
||||
# Release closure lands in the release cache.
|
||||
# Release closure (the actual package, not the check output) lands in the
|
||||
# release cache.
|
||||
- name: Push to Attic release cache
|
||||
env:
|
||||
ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
|
||||
run: |
|
||||
attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
|
||||
attic push radiantwave:radiantwave ./result
|
||||
attic push radiantwave:radiantwave ./result-pkg
|
||||
|
||||
+2
-2
@@ -281,10 +281,10 @@ void Home::render(SDL_Renderer *renderer)
|
||||
fourSpaces.destroy();
|
||||
|
||||
const float margin = 20.0f;
|
||||
float rectRight = fw - margin;
|
||||
float rectRight = fw - margin - 50.0f;
|
||||
float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
|
||||
|
||||
float lineY = fh - margin;
|
||||
float lineY = fh - margin - 50.0f;
|
||||
const float lineGap = 6.0f;
|
||||
for (size_t i = footerNames_.size(); i-- > 0;)
|
||||
{
|
||||
|
||||
+6
-1
@@ -7,6 +7,7 @@
|
||||
#include "logical_size.h"
|
||||
#include "logger/logger.h"
|
||||
#include "provisioning.h"
|
||||
#include "scroller_page.h"
|
||||
|
||||
namespace {
|
||||
// How long audio fades out before the app tears down on quit. Only applied
|
||||
@@ -201,12 +202,16 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
|
||||
std::to_string(event->window.data1) + "x" +
|
||||
std::to_string(event->window.data2));
|
||||
// Logical presentation persists across resizes; re-apply defensively
|
||||
// in case backend state was reset underneath us.
|
||||
// in case backend state was reset underneath us. Skip while the
|
||||
// scroller is active — it owns its own presentation (NONE, full
|
||||
// window) and restores LETTERBOX in onPop.
|
||||
if (!dynamic_cast<ScrollerPage *>(state.pages.current())) {
|
||||
SDL_SetRenderLogicalPresentation(state.renderer,
|
||||
radiantwave::kDesignWidth,
|
||||
radiantwave::kDesignHeight,
|
||||
SDL_LOGICAL_PRESENTATION_LETTERBOX);
|
||||
}
|
||||
}
|
||||
|
||||
if (!state.keybinds.handleEvent(*event)) {
|
||||
state.pages.handleEvent(*event);
|
||||
|
||||
+36
-7
@@ -34,13 +34,37 @@ void ScrollerPage::onPush(AppState &state)
|
||||
{
|
||||
state_ = &state;
|
||||
|
||||
int winW = 0;
|
||||
int winH = 0;
|
||||
radiantwave::getLayoutSize(state.renderer, &winW, &winH);
|
||||
screenW_ = static_cast<float>(winW);
|
||||
screenH_ = static_cast<float>(winH);
|
||||
// Lines are capped at the full screen width; the widest Fibonacci lines are
|
||||
// sized to fill it with whole words (peak word count derived from the
|
||||
// Save the current logical presentation (LETTERBOX at design resolution)
|
||||
// and switch to NONE so we render into the full physical window. This
|
||||
// lets the scroller scroll the entire vertical extent of tall/rotated
|
||||
// displays while keeping text at the same pixel scale. onPop restores
|
||||
// the original presentation for other pages.
|
||||
SDL_GetRenderLogicalPresentation(state.renderer, &savedLogicalW_,
|
||||
&savedLogicalH_, &savedMode_);
|
||||
|
||||
SDL_Window *window = SDL_GetRenderWindow(state.renderer);
|
||||
int windowW = 0;
|
||||
int windowH = 0;
|
||||
if (window)
|
||||
{
|
||||
SDL_GetWindowSize(window, &windowW, &windowH);
|
||||
}
|
||||
if (windowW <= 0)
|
||||
{
|
||||
windowW = radiantwave::kDesignWidth;
|
||||
}
|
||||
if (windowH <= 0)
|
||||
{
|
||||
windowH = radiantwave::kDesignHeight;
|
||||
}
|
||||
|
||||
SDL_SetRenderLogicalPresentation(state.renderer, windowW, windowH,
|
||||
SDL_LOGICAL_PRESENTATION_DISABLED);
|
||||
|
||||
screenW_ = static_cast<float>(windowW);
|
||||
screenH_ = static_cast<float>(windowH);
|
||||
// Lines are capped at the full screen width; the widest Fibonacci lines
|
||||
// are sized to fill it with whole words (peak word count derived from the
|
||||
// screen), independent of resolution.
|
||||
maxLineWidth_ = screenW_;
|
||||
|
||||
@@ -101,6 +125,11 @@ void ScrollerPage::onPause(AppState &state)
|
||||
|
||||
void ScrollerPage::onPop(AppState &state)
|
||||
{
|
||||
// Restore the original logical presentation so other pages (Home,
|
||||
// Settings, etc.) render in the design-resolution LETTERBOX space.
|
||||
SDL_SetRenderLogicalPresentation(state.renderer, savedLogicalW_,
|
||||
savedLogicalH_, savedMode_);
|
||||
|
||||
state.audio.stopTrackFadeOut(kFadeSeconds);
|
||||
state.keybinds.unbindAll();
|
||||
destroyResources();
|
||||
|
||||
@@ -115,4 +115,8 @@ private:
|
||||
float velocityDelay_ = 2.5f;
|
||||
int velocityState_ = 0;
|
||||
float velocityTimer_ = 0.0f;
|
||||
|
||||
int savedLogicalW_ = 0;
|
||||
int savedLogicalH_ = 0;
|
||||
SDL_RendererLogicalPresentation savedMode_ = SDL_LOGICAL_PRESENTATION_DISABLED;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user