Skip to content

Commit 2313d46

Browse files
committed
fixed #2 (callback not called)
- fixed "Dynamically changing HiDPI awareness does not trigger content callback"
1 parent 44a7aab commit 2313d46

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/cpp/emscripten/glfw3/Window.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,14 @@ bool Window::maybeRescale(std::function<void()> const &iAction)
135135
{
136136
auto oldScale = getScale();
137137
iAction();
138-
auto scaleChanged = oldScale != getScale();
138+
auto newScale = getScale();
139+
auto scaleChanged = oldScale != newScale;
139140
if(scaleChanged)
141+
{
140142
setCanvasSize(fSize);
143+
if(fContentScaleCallback)
144+
fContentScaleCallback(asOpaquePtr(), newScale, newScale);
145+
}
141146
return scaleChanged;
142147
}
143148

@@ -148,8 +153,7 @@ void Window::setMonitorScale(float iScale)
148153
{
149154
if(fMonitorScale != iScale)
150155
{
151-
if(maybeRescale([this, scale=iScale]() { fMonitorScale = scale; }) && fContentScaleCallback)
152-
fContentScaleCallback(asOpaquePtr(), fMonitorScale, fMonitorScale);
156+
maybeRescale([this, scale=iScale]() { fMonitorScale = scale; });
153157
}
154158
}
155159

0 commit comments

Comments
 (0)