Browse Source

Fixed a bug in Font::setUnderline().

tags/2021-05-28
jules 13 years ago
parent
commit
502af083aa
2 changed files with 4 additions and 3 deletions
  1. +3
    -3
      modules/juce_events/native/juce_mac_MessageManager.mm
  2. +1
    -0
      modules/juce_graphics/fonts/juce_Font.cpp

+ 3
- 3
modules/juce_events/native/juce_mac_MessageManager.mm View File

@@ -43,7 +43,7 @@ public:
NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
[center addObserver: delegate selector: @selector (trackingBegan:)
[center addObserver: delegate selector: @selector (mainMenuTrackingBegan:)
name: NSMenuDidBeginTrackingNotification object: nil];
if (JUCEApplicationBase::isStandaloneApp())
@@ -110,7 +110,7 @@ private:
addMethod (@selector (applicationDidResignActive:), applicationDidResignActive, "v@:@");
addMethod (@selector (applicationWillUnhide:), applicationWillUnhide, "v@:@");
addMethod (@selector (broadcastMessageCallback:), broadcastMessageCallback, "v@:@");
addMethod (@selector (trackingBegan:), trackingBegan, "v@:@");
addMethod (@selector (mainMenuTrackingBegan:), mainMenuTrackingBegan, "v@:@");
addMethod (@selector (dummyMethod), dummyMethod, "v@:");
registerClass();
@@ -176,7 +176,7 @@ private:
MessageManager::getInstance()->deliverBroadcastMessage (messageString);
}
static void trackingBegan (id /*self*/, SEL, NSNotification*)
static void mainMenuTrackingBegan (id /*self*/, SEL, NSNotification*)
{
if (menuTrackingBeganCallback != nullptr)
(*menuTrackingBeganCallback)();


+ 1
- 0
modules/juce_graphics/fonts/juce_Font.cpp View File

@@ -596,6 +596,7 @@ void Font::setItalic (const bool shouldBeItalic)
void Font::setUnderline (const bool shouldBeUnderlined)
{
dupeInternalIfShared();
font->underline = shouldBeUnderlined;
}


Loading…
Cancel
Save