File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 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
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
Original file line number Diff line number Diff line change @@ -367,8 +367,10 @@ void MyEventHandler::onPreInit(nc::AppConfiguration &config)
367367void 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>();
You can’t perform that action at this time.
0 commit comments