Browse Source

TextLayout fix. OSX fullscreen fix.

tags/2021-05-28
jules 13 years ago
parent
commit
a8083eb293
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      modules/juce_graphics/fonts/juce_TextLayout.cpp
  2. +1
    -1
      modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

+ 3
- 0
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());


+ 1
- 1
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:)])


Loading…
Cancel
Save