From 6573cd1b5cd979f55f22eabb45021c674b310f1e Mon Sep 17 00:00:00 2001
From: Kim Wittenburg <Kim@Kims-MacBook-Pro.local>
Date: Mon, 15 Sep 2014 15:57:57 +0200
Subject: [PATCH] Added Functions Popover Template

---
 MathKit/FunctionsButtonDisclosure.png    | Bin 0 -> 3864 bytes
 MathKit/FunctionsButtonDisclosure@2x.png | Bin 0 -> 3961 bytes
 MathPad/MPExpressionView.h               |   3 ++
 MathPad/MPExpressionView.m               |  47 +++++++++++++++++++----
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 MathKit/FunctionsButtonDisclosure.png
 create mode 100644 MathKit/FunctionsButtonDisclosure@2x.png

diff --git a/MathKit/FunctionsButtonDisclosure.png b/MathKit/FunctionsButtonDisclosure.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec4a662e248f43eff8f599aa3e87af77e043436f
GIT binary patch
literal 3864
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

literal 0
HcmV?d00001

diff --git a/MathKit/FunctionsButtonDisclosure@2x.png b/MathKit/FunctionsButtonDisclosure@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e1451789221758bceb5bf8a7a53c32dd83d5567
GIT binary patch
literal 3961
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

literal 0
HcmV?d00001

diff --git a/MathPad/MPExpressionView.h b/MathPad/MPExpressionView.h
index 97f6cc3..3da1ec9 100644
--- a/MathPad/MPExpressionView.h
+++ b/MathPad/MPExpressionView.h
@@ -28,4 +28,7 @@
 @property (nonatomic, weak) id target;
 @property (nonatomic) SEL action;
 
+#pragma mark Actions
+- (IBAction)showFunctions:(id)sender;
+
 @end
diff --git a/MathPad/MPExpressionView.m b/MathPad/MPExpressionView.m
index 747b241..79e2183 100644
--- a/MathPad/MPExpressionView.m
+++ b/MathPad/MPExpressionView.m
@@ -68,7 +68,7 @@
 {
     NSRect expressionBounds = [self.expressionStorage.rootLayout bounds];
     CGFloat y = (self.bounds.size.height - expressionBounds.size.height) / 2 + fabs(expressionBounds.origin.y);
-    return NSMakePoint(0, y);
+    return NSMakePoint(10, y);
 }
 
 @end
@@ -303,14 +303,25 @@
 - (void)initializeExpressionView
 {
     // Setup the Expression Storage
-    MPExpressionStorage *expressionStorage = [[MPExpressionStorage alloc] initWithElements:@[@"12345", [[MPSumFunction alloc] init]]];
+    MPExpressionStorage *expressionStorage = [[MPExpressionStorage alloc] initWithElements:@[@"12345", [[MPSumFunction alloc] init], [[MPSumFunction alloc] init]]];
     expressionStorage.expressionView = self;
     _expressionStorage = expressionStorage;
     
+    NSBundle *frameworkBundle = [NSBundle bundleForClass:[self class]];
+    NSImage *image = [frameworkBundle imageForResource:@"FunctionsButtonDisclosure"];
+    [image setName:@"FunctionsButtonDisclosure"];
     // Setup the Functions Button
     NSButton *button = [[NSButton alloc] initWithFrame:NSZeroRect];
-    button.buttonType = NSSwitchButton;
-    [button setTitle:@"Functions"];
+    button.target = self;
+    button.action = @selector(showFunctions:);
+    button.buttonType = NSMomentaryChangeButton;
+    button.bezelStyle = NSShadowlessSquareBezelStyle;
+    button.bordered = NO;
+    NSFont *font = [NSFont fontWithName:@"Times New Roman" size:25.0];
+    NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:@"Σ" attributes:@{NSFontAttributeName: font, NSForegroundColorAttributeName: [NSColor colorWithWhite:.61 alpha:1]}];
+    button.attributedTitle = attributedTitle;
+    button.imagePosition = NSImageLeft;
+    button.image = image;
     self.functionsButton = button;
     [self addSubview:self.functionsButton];
     
@@ -336,6 +347,20 @@
     self.needsDisplay = YES;
 }
 
+#pragma mark Actions
+- (void)showFunctions:(id)sender
+{
+    NSViewController *controller = [[NSViewController alloc] initWithNibName:nil
+                                                                      bundle:nil];
+    controller.view = [[NSView alloc] init];
+    NSPopover *popover = [[NSPopover alloc] init];
+    popover.contentSize = NSMakeSize(100.0, 100.0);
+    popover.contentViewController = controller;
+    popover.animates = YES;
+    popover.behavior = NSPopoverBehaviorSemitransient;
+    [popover showRelativeToRect:[sender bounds] ofView:sender preferredEdge:NSMaxYEdge];
+}
+
 #pragma mark NSView Stuff
 - (BOOL)acceptsFirstResponder
 {
@@ -357,10 +382,16 @@
     return YES;
 }
 
+- (void)setFrame:(NSRect)frameRect
+{
+    [self setNeedsLayout:YES];
+    [super setFrame:frameRect];
+}
+
 - (void)layout
 {
     NSSize buttonSize = [self.functionsButton fittingSize];
-    self.functionsButton.frame = NSMakeRect(self.bounds.size.width - buttonSize.width,
+    self.functionsButton.frame = NSMakeRect(self.bounds.size.width - buttonSize.width - 10,
                                             (self.bounds.size.height - buttonSize.height) / 2,
                                             buttonSize.width,
                                             buttonSize.height);
@@ -369,9 +400,9 @@
 
 - (NSSize)intrinsicContentSize
 {
-//    return NSMakeSize(500, 500);
-//    return self.bounds.size;
-    return self.expressionStorage.rootLayout.bounds.size;
+    NSSize size = self.expressionStorage.rootLayout.bounds.size;
+    size.width += 100;
+    return size;
 }
 
 - (void)resetCursorRects