Compare commits
5
Commits
47785cd4b9
..
1.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43cd93bbd7 | ||
|
|
92ba9f39fb | ||
|
|
400c6a782b | ||
|
|
9b0bd517c6 | ||
|
|
babb74c7ad |
@@ -41,10 +41,17 @@ jobs:
|
|||||||
# checks is keyed per-system (checks.<system>.default); nix build's
|
# checks is keyed per-system (checks.<system>.default); nix build's
|
||||||
# #attr shorthand can't resolve it, so resolve the current system inline.
|
# #attr shorthand can't resolve it, so resolve the current system inline.
|
||||||
# --impure lets the flake read APP_VERSION via builtins.getEnv
|
# --impure lets the flake read APP_VERSION via builtins.getEnv
|
||||||
# (pure evals always get the package defaults). The offline test suite
|
# (pure evals always get the package defaults).
|
||||||
# runs in the package's checkPhase.
|
- 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
|
- 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
|
- name: Live portal tests
|
||||||
env:
|
env:
|
||||||
@@ -59,10 +66,11 @@ jobs:
|
|||||||
./build/test_license_service
|
./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
|
- name: Push to Attic release cache
|
||||||
env:
|
env:
|
||||||
ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
|
ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN_PROD }}
|
||||||
run: |
|
run: |
|
||||||
attic login radiantwave https://attic.radiantwavetech.com "$ATTIC_TOKEN"
|
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();
|
fourSpaces.destroy();
|
||||||
|
|
||||||
const float margin = 20.0f;
|
const float margin = 20.0f;
|
||||||
float rectRight = fw - margin;
|
float rectRight = fw - margin - 50.0f;
|
||||||
float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
|
float rectLeft = rectRight - (maxNameW + spaceW4 + maxValueW);
|
||||||
|
|
||||||
float lineY = fh - margin;
|
float lineY = fh - margin - 50.0f;
|
||||||
const float lineGap = 6.0f;
|
const float lineGap = 6.0f;
|
||||||
for (size_t i = footerNames_.size(); i-- > 0;)
|
for (size_t i = footerNames_.size(); i-- > 0;)
|
||||||
{
|
{
|
||||||
|
|||||||
+10
-5
@@ -7,6 +7,7 @@
|
|||||||
#include "logical_size.h"
|
#include "logical_size.h"
|
||||||
#include "logger/logger.h"
|
#include "logger/logger.h"
|
||||||
#include "provisioning.h"
|
#include "provisioning.h"
|
||||||
|
#include "scroller_page.h"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
// How long audio fades out before the app tears down on quit. Only applied
|
// How long audio fades out before the app tears down on quit. Only applied
|
||||||
@@ -201,11 +202,15 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
|
|||||||
std::to_string(event->window.data1) + "x" +
|
std::to_string(event->window.data1) + "x" +
|
||||||
std::to_string(event->window.data2));
|
std::to_string(event->window.data2));
|
||||||
// Logical presentation persists across resizes; re-apply defensively
|
// 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
|
||||||
SDL_SetRenderLogicalPresentation(state.renderer,
|
// scroller is active — it owns its own presentation (NONE, full
|
||||||
radiantwave::kDesignWidth,
|
// window) and restores LETTERBOX in onPop.
|
||||||
radiantwave::kDesignHeight,
|
if (!dynamic_cast<ScrollerPage *>(state.pages.current())) {
|
||||||
SDL_LOGICAL_PRESENTATION_LETTERBOX);
|
SDL_SetRenderLogicalPresentation(state.renderer,
|
||||||
|
radiantwave::kDesignWidth,
|
||||||
|
radiantwave::kDesignHeight,
|
||||||
|
SDL_LOGICAL_PRESENTATION_LETTERBOX);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state.keybinds.handleEvent(*event)) {
|
if (!state.keybinds.handleEvent(*event)) {
|
||||||
|
|||||||
+624
-691
File diff suppressed because it is too large
Load Diff
@@ -115,4 +115,8 @@ private:
|
|||||||
float velocityDelay_ = 2.5f;
|
float velocityDelay_ = 2.5f;
|
||||||
int velocityState_ = 0;
|
int velocityState_ = 0;
|
||||||
float velocityTimer_ = 0.0f;
|
float velocityTimer_ = 0.0f;
|
||||||
|
|
||||||
|
int savedLogicalW_ = 0;
|
||||||
|
int savedLogicalH_ = 0;
|
||||||
|
SDL_RendererLogicalPresentation savedMode_ = SDL_LOGICAL_PRESENTATION_DISABLED;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user