All on Tk/Cocoa: Improve view performance during resizing; implement custom drawing of scroller to remove flickering and ghosted appearance during window operations; reduce flickering of menubutton during resizing, but do not completely eliminate ghosted rendering when widget is unmapped

1 files changed, 52 insertions, 1 deletions

diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 3658f7e..a34ce88 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -7,6 +7,8 @@
  * Copyright (c) 1996 by Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+*  Copyright (c) 2014 Marc Culler.
+ * Copyright (c) 2014 Kevin Walzer/WordTech Commununications LLC.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -31,11 +33,22 @@ NSRect                  TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
  * aware of the state of its Tk parent.  This subclass overrides the drawRect
  * method so that it will not draw itself if the widget is completely outside
  * of its container.
+ *
+ * Custom drawing of the knob seems to work around the flickering visible after  
+ * private API's were removed. Based on technique outlined at 
+ * http://stackoverflow.com/questions/1604682/nsscroller-
+ * graphical-glitches-lag. Only supported on 10.7 and above.
  */
+ 
 
 @interface TkNSScroller: NSScroller
 -(void) drawRect:(NSRect)dirtyRect;
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+-(BOOL) isHorizontal;
+-(void) drawKnob;
+- (void)drawArrow:(NSScrollerArrow)arrow highlightPart:(int)flag;
+- (void)drawKnobSlotInRect:(NSRect)rect highlight:(BOOL)highlight;
+#endif
 @end
 
 @implementation TkNSScroller
@@ -77,6 +90,44 @@ NSRect                  TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
 	}
 	[super drawRect:dirtyRect];
     }
+    
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+- (BOOL)isHorizontal {
+    NSRect bounds = [self bounds];
+    return NSWidth(bounds) < NSHeight (bounds);
+}
+
+
+- (void)drawKnob
+{
+    NSRect knobRect = [self rectForPart:NSScrollerKnob];
+    
+    if ([self isHorizontal]) {
+	NSRect newRect = NSMakeRect(knobRect.origin.x, knobRect.origin.y, knobRect.size.width - 5, knobRect.size.height);
+	NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:7 yRadius:7];
+ 
+        [[NSColor lightGrayColor] set];
+	[path fill];
+    } else {
+	NSRect newRect = NSMakeRect(knobRect.origin.x, knobRect.origin.y, knobRect.size.width, knobRect.size.height - 5);
+	NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:7 yRadius:7];
+ 
+    [[NSColor lightGrayColor] set];
+	[path fill];
+    }
+       
+}
+
+- (void)drawArrow:(NSScrollerArrow)arrow highlightPart:(int)flag
+{
+    // We don't want arrows
+}
+
+- (void)drawKnobSlotInRect:(NSRect)rect highlight:(BOOL)highlight
+{
+
+}
+#endif   
 
 @end