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

TextLayout fix. OSX fullscreen fix.

Browse source
This commit is contained in:
jules 2012-02-23 13:41:05 +00:00
parent 1c55b28390
commit a8083eb293
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_graphics/fonts/juce_TextLayout.cpp
View file

@ -354,6 +354,9 @@ namespace TextLayoutHelpers
if (t->line != nextToken->line)
{
if (currentRun == nullptr)
currentRun = new TextLayout::Run();
addRun (currentLine, currentRun.release(), t, runStartPosition, charPosition);
currentLine->stringRange = Range<int> (lineStartPosition, charPosition);
layout.addLine (currentLine.release());

2
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
View file

@ -1782,9 +1782,9 @@ void Desktop::setKioskComponent (Component* kioskModeComponent, bool enableOrDis
{
#if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
#if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
NSViewComponentPeer* const peer = dynamic_cast<NSViewComponentPeer*> (kioskModeComponent->getPeer());
#if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (peer != nullptr
&& peer->hasNativeTitleBar()
&& [peer->window respondsToSelector: @selector (toggleFullScreen:)])