From 33bba67dde95b87a020038aba92afb5319080703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 26 Jul 2026 13:22:21 -0300 Subject: [PATCH] Correct paddings in Glyph struct. Disable Haiku build until beta6 vm. --- .github/workflows/ecode-nightly.yml | 68 ++++++++++++++--------------- include/eepp/graphics/font.hpp | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ecode-nightly.yml b/.github/workflows/ecode-nightly.yml index cdc3bb5fa..b76b6743e 100644 --- a/.github/workflows/ecode-nightly.yml +++ b/.github/workflows/ecode-nightly.yml @@ -443,40 +443,40 @@ jobs: files: | projects/freebsd/ecode/ecode-freebsd-${{ env.INSTALL_REF }}-x86_64.tar.gz - build_haiku_x86_64: - name: Haiku x86_64 Nightly - needs: release - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v6 - with: { fetch-depth: 0, submodules: 'recursive' } - - name: Set Environment Variables - run: | - echo "INSTALL_REF=${{ needs.release.outputs.version }}" >> "$GITHUB_ENV" - echo "RARCH=$(uname -m)" >> "$GITHUB_ENV" - - uses: vmactions/haiku-vm@v1 - env: - INSTALL_REF: ${{ needs.release.outputs.version }} - with: - envs: 'INSTALL_REF' - usesh: true - mem: 8192 - disable-cache: true - prepare: | - pkgman install -y libsdl2 libsdl2_devel git gcc premake5 - run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" - bash projects/scripts/patch_commit_number.sh - sh projects/haiku/ecode/build.app.sh --version ${{ env.INSTALL_REF }} - - name: Upload Files - uses: softprops/action-gh-release@v3 - with: - tag_name: ${{ needs.release.outputs.version }} - draft: false - prerelease: true - files: | - projects/haiku/ecode/ecode-haiku-${{ env.INSTALL_REF }}-x86_64.tar.gz + # build_haiku_x86_64: + # name: Haiku x86_64 Nightly + # needs: release + # runs-on: ubuntu-latest + # steps: + # - name: Checkout Code + # uses: actions/checkout@v6 + # with: { fetch-depth: 0, submodules: 'recursive' } + # - name: Set Environment Variables + # run: | + # echo "INSTALL_REF=${{ needs.release.outputs.version }}" >> "$GITHUB_ENV" + # echo "RARCH=$(uname -m)" >> "$GITHUB_ENV" + # - uses: vmactions/haiku-vm@v1 + # env: + # INSTALL_REF: ${{ needs.release.outputs.version }} + # with: + # envs: 'INSTALL_REF' + # usesh: true + # mem: 8192 + # disable-cache: true + # prepare: | + # pkgman install -y libsdl2 libsdl2_devel git gcc premake5 + # run: | + # git config --global --add safe.directory "$GITHUB_WORKSPACE" + # bash projects/scripts/patch_commit_number.sh + # sh projects/haiku/ecode/build.app.sh --version ${{ env.INSTALL_REF }} + # - name: Upload Files + # uses: softprops/action-gh-release@v3 + # with: + # tag_name: ${{ needs.release.outputs.version }} + # draft: false + # prerelease: true + # files: | + # projects/haiku/ecode/ecode-haiku-${{ env.INSTALL_REF }}-x86_64.tar.gz build_windows_msvc: name: Windows x86_64 MSVC Nightly diff --git a/include/eepp/graphics/font.hpp b/include/eepp/graphics/font.hpp index e4f248d4d..14456a8b0 100644 --- a/include/eepp/graphics/font.hpp +++ b/include/eepp/graphics/font.hpp @@ -21,8 +21,8 @@ struct EE_API Glyph { Sizef size; ///< The glyph bitmap size on screen int lsbDelta{ 0 }; //!< Left offset after forced autohint. Internally used by getKerning() int rsbDelta{ 0 }; //!< Right offset after forced autohint. Internally used by getKerning() - Font* font{ nullptr }; ///< The glyph font GlyphRenderMode renderMode{ GlyphRenderMode::Mask }; ///< Atlas texel compositing mode + Font* font{ nullptr }; ///< The glyph font }; enum class FontType { TTF, BMF, Sprite };