Skip to content

Commit d8d8ad0

Browse files
committed
Update Intel macOS GitHub Actions runner to 15
- Fix compilation with the latest version of ImGui on Android
1 parent 7ff7324 commit d8d8ad0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
BuildType: [Debug, Release, BinDist]
21-
os: [macOS-13, macOS-15]
21+
os: [macOS-15, macOS-15-intel]
2222

2323
runs-on: ${{ matrix.os }}
2424

@@ -36,7 +36,7 @@ jobs:
3636
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
3737
export OS=macos15
3838
else
39-
export OS=macos13
39+
export OS=macos15-intel
4040
fi
4141
export CC=appleclang
4242
export BRANCH_NAME=$(git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD)
@@ -112,7 +112,7 @@ jobs:
112112
if [[ "${{ matrix.os }}" == "macOS-15" ]]; then
113113
export OS=macos15
114114
else
115-
export OS=macos13
115+
export OS=macos15-intel
116116
fi
117117
export CC=appleclang
118118
export PROJECT_EXT=dmg

src/main.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,10 @@ void MyEventHandler::onPreInit(nc::AppConfiguration &config)
367367
void MyEventHandler::onInit()
368368
{
369369
#ifdef __ANDROID__
370-
ImGuiIO &io = ImGui::GetIO();
371-
io.FontGlobalScale = 2.0f;
370+
const float scalingFactor = nc::theApplication().gfxDevice().windowScalingFactor();
371+
ImGuiStyle &style = ImGui::GetStyle();
372+
style.FontScaleMain = scalingFactor;
373+
style.ScaleAllSizes(scalingFactor);
372374
#endif
373375

374376
cameraCtrl_ = nctl::makeUnique<CameraController>();

0 commit comments

Comments
 (0)