mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

MouseCursor: Allow arbitrarily-sized cursors on Windows

Browse source
This commit is contained in:
reuk 2021-12-30 17:40:34 +00:00
parent b0e689eaf4
commit 82df66100c
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_basics/mouse/juce_MouseCursor.cpp
View file

@ -43,7 +43,7 @@ public:
standard (false)
{
// your hotspot needs to be within the bounds of the image!
jassert (image.getImage().getBounds().contains (hotSpot));
jassert (image.getScaledBounds().toNearestInt().contains (hotSpot));
}
static std::shared_ptr<SharedCursorHandle> createStandard (const MouseCursor::StandardCursorType type)

21
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -5199,17 +5199,18 @@ private:
if (iter != cursorsBySize.end())
return iter->second;
const auto img = info.image.getImage();
const auto imgW = jmax (1, img.getWidth());
const auto imgH = jmax (1, img.getHeight());
const auto logicalSize = info.image.getScaledBounds();
const auto scale = (float) size / (float) unityCursorSize;
const auto scaleToUse = scale * jmin (1.0f, jmin ((float) unityCursorSize / (float) imgW,
(float) unityCursorSize / (float) imgH)) / info.image.getScale();
const auto rescaled = img.rescaled (roundToInt (scaleToUse * (float) imgW),
roundToInt (scaleToUse * (float) imgH));
const auto hx = jlimit (0, rescaled.getWidth(), roundToInt (scaleToUse * (float) info.hotspot.x));
const auto hy = jlimit (0, rescaled.getHeight(), roundToInt (scaleToUse * (float) info.hotspot.y));
const auto physicalSize = logicalSize * scale;
const auto& image = info.image.getImage();
const auto rescaled = image.rescaled (roundToInt ((float) physicalSize.getWidth()),
roundToInt ((float) physicalSize.getHeight()));
const auto effectiveScale = rescaled.getWidth() / logicalSize.getWidth();
const auto hx = jlimit (0, rescaled.getWidth(), roundToInt ((float) info.hotspot.x * effectiveScale));
const auto hy = jlimit (0, rescaled.getHeight(), roundToInt ((float) info.hotspot.y * effectiveScale));
return cursorsBySize.emplace (size, IconConverters::createHICONFromImage (rescaled, false, hx, hy)).first->second;
}