mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-30 02:50:05 +00:00
Code Activity

When calling repaint() without a MessageManagerLock, it now always asserts

Browse source
This commit is contained in:
jules 2017-10-16 10:13:19 +01:00
parent 8a7f992725
commit ffb64487ed
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/juce_gui_basics/components/juce_Component.cpp
View file

@ -1447,7 +1447,7 @@ Component* Component::getComponentAt (Point<int> position)
return nullptr;
}
Component* Component::getComponentAt (const int x, const int y)
Component* Component::getComponentAt (int x, int y)
{
return getComponentAt ({ x, y });
}
@ -1623,7 +1623,7 @@ Component* Component::findChildWithID (StringRef targetID) const noexcept
Component* Component::getTopLevelComponent() const noexcept
{
const Component* comp = this;
auto* comp = this;
while (comp->parentComponent != nullptr)
comp = comp->parentComponent;
@ -1842,9 +1842,9 @@ float Component::getAlpha() const noexcept
return (255 - componentTransparency) / 255.0f;
}
void Component::setAlpha (const float newAlpha)
void Component::setAlpha (float newAlpha)
{
const uint8 newIntAlpha = (uint8) (255 - jlimit (0, 255, roundToInt (newAlpha * 255.0)));
auto newIntAlpha = (uint8) (255 - jlimit (0, 255, roundToInt (newAlpha * 255.0)));
if (componentTransparency != newIntAlpha)
{
@ -1872,7 +1872,7 @@ void Component::repaint()
internalRepaintUnchecked (getLocalBounds(), true);
}
void Component::repaint (const int x, const int y, const int w, const int h)
void Component::repaint (int x, int y, int w, int h)
{
internalRepaint ({ x, y, w, h });
}
@ -1896,8 +1896,12 @@ void Component::internalRepaint (Rectangle<int> area)
internalRepaintUnchecked (area, false);
}
void Component::internalRepaintUnchecked (Rectangle<int> area, const bool isEntireComponent)
void Component::internalRepaintUnchecked (Rectangle<int> area, bool isEntireComponent)
{
// if component methods are being called from threads other than the message
// thread, you'll need to use a MessageManagerLock object to make sure it's thread-safe.
ASSERT_MESSAGE_MANAGER_IS_LOCKED
if (flags.visibleFlag)
{
if (cachedImage != nullptr)
@ -1907,10 +1911,6 @@ void Component::internalRepaintUnchecked (Rectangle<int> area, const bool isEnti
if (flags.hasHeavyweightPeerFlag)
{
// if component methods are being called from threads other than the message
// thread, you'll need to use a MessageManagerLock object to make sure it's thread-safe.
ASSERT_MESSAGE_MANAGER_IS_LOCKED
if (auto* peer = getPeer())
{
// Tweak the scaling so that the component's integer size exactly aligns with the peer's scaled size