Skip to content

Commit 055afd0

Browse files
committed
Fix compilation with the latest version of ImGui
- Update Intel macOS GitHub Actions runner to 15
1 parent a6d6fc5 commit 055afd0

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.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/particle_editor_gui.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,5 +1965,6 @@ void MyEventHandler::applyGuiStyleConfig()
19651965
style.WindowBorderSize = cfg.windowBorder ? 1.0f : 0.0f;
19661966
style.FrameBorderSize = cfg.frameBorder ? 1.0f : 0.0f;
19671967
style.PopupBorderSize = cfg.popupBorder ? 1.0f : 0.0f;
1968-
ImGui::GetIO().FontGlobalScale = cfg.scaling;
1968+
style.FontScaleMain = cfg.scaling;
1969+
style.ScaleAllSizes(cfg.scaling);
19691970
}

0 commit comments

Comments
 (0)