summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2015-01-12 03:18:08 (GMT)
committerKevin Walzer <kw@codebykevin.com>2015-01-12 03:18:08 (GMT)
commit13a883e4c3662265de27a4013622d4ccb6512e7a (patch)
tree8838c100492cdf498d84ad2eb187982e8fb6f0fd /macosx
parent8e30b0036fc3c6f090e11f2810f10a5d7c4a6602 (diff)
downloadtk-13a883e4c3662265de27a4013622d4ccb6512e7a.zip
tk-13a883e4c3662265de27a4013622d4ccb6512e7a.tar.gz
tk-13a883e4c3662265de27a4013622d4ccb6512e7a.tar.bz2
Revert changes to Mac scrollbar; native implementation is best that can be done, custom drawing in scrollbar is worse from UI standpoint.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c4
-rw-r--r--macosx/tkMacOSXScrlbr.c119
-rw-r--r--macosx/tkMacOSXWindowEvent.c5
3 files changed, 36 insertions, 92 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index a807dfa..79ce70a 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -54,7 +54,7 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
@end
@interface TKApplication(TKScrlbr)
-- (void) _setupScrollBarNotifications;
+//- (void) _setupScrollBarNotifications;
@end
@interface TKApplication(TKMenus)
@@ -108,7 +108,7 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
selector:@selector(_postedNotification:) name:nil object:nil];
#endif
[self _setupWindowNotifications];
- [self _setupScrollBarNotifications];
+ // [self _setupScrollBarNotifications];
[self _setupApplicationNotifications];
}
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 6b4d1ff..ebb99f3 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -7,8 +7,7 @@
* 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.
*/
@@ -22,7 +21,6 @@
#endif
*/
-
NSRect TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
/*
@@ -33,106 +31,57 @@ 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
-
-- (void)drawRect:(NSRect)dirtyRect
-{
- NSInteger tag = [self tag];
- if ( tag != -1) {
- TkScrollbar *scrollPtr = (TkScrollbar *)tag;
- MacDrawable* macWin = (MacDrawable *)scrollPtr;
- Tk_Window tkwin = scrollPtr->tkwin;
- NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr);
- /* Do not draw if the widget is misplaced or unmapped. */
- if ( NSIsEmptyRect(Tkframe) ||
- ! macWin->winPtr->flags & TK_MAPPED ||
- ! NSEqualRects(Tkframe, [self frame])
- ) {
- return;
- }
-
- /*
- * Do not draw if the widget is completely outside of its parent.
- */
- if (tkwin) {
- int parent_height = Tk_Height(Tk_Parent(tkwin));
- int widget_height = Tk_Height(tkwin);
- int y = Tk_Y(tkwin);
- if ( y > parent_height || y + widget_height < 0 ) {
+ - (void)drawRect:(NSRect)dirtyRect
+ {
+ NSInteger tag = [self tag];
+ if ( tag != -1) {
+ TkScrollbar *scrollPtr = (TkScrollbar *)tag;
+ MacDrawable* macWin = (MacDrawable *)scrollPtr;
+ Tk_Window tkwin = scrollPtr->tkwin;
+ NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr);
+ /* Do not draw if the widget is misplaced or unmapped. */
+ if ( NSIsEmptyRect(Tkframe) ||
+ ! macWin->winPtr->flags & TK_MAPPED ||
+ ! NSEqualRects(Tkframe, [self frame])
+ ) {
return;
}
- int parent_width = Tk_Width(Tk_Parent(tkwin));
- int widget_width = Tk_Width(tkwin);
- int x = Tk_X(tkwin);
- if (x > parent_width || x + widget_width < 0) {
- return;
+ /*
+ * Do not draw if the widget is completely outside of its parent.
+ */
+ if (tkwin) {
+ int parent_height = Tk_Height(Tk_Parent(tkwin));
+ int widget_height = Tk_Height(tkwin);
+ int y = Tk_Y(tkwin);
+ if ( y > parent_height || y + widget_height < 0 ) {
+ return;
+ }
+
+ int parent_width = Tk_Width(Tk_Parent(tkwin));
+ int widget_width = Tk_Width(tkwin);
+ int x = Tk_X(tkwin);
+ if (x > parent_width || x + widget_width < 0) {
+ return;
+ }
}
}
+ [super drawRect:dirtyRect];
}
- [super drawRect:dirtyRect];
-}
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-- (BOOL)isVertical {
- NSRect bounds = [self bounds];
- return NSWidth(bounds) < NSHeight (bounds);
-}
-
-
-- (void)drawKnob
-{
- NSRect knobRect = [self rectForPart:NSScrollerKnob];
-
- if ([self isVertical]) {
- NSRect newRect = NSMakeRect(knobRect.origin.x + 3, knobRect.origin.y, knobRect.size.width - 6, knobRect.size.height);
- NSBezierPath *scrollerPath = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:4 yRadius:4];
-
- [[NSColor lightGrayColor] set];
- [scrollerPath fill];
- } else {
- NSRect newRect = NSMakeRect(knobRect.origin.x, knobRect.origin.y + 3, knobRect.size.width, knobRect.size.height - 6);
- NSBezierPath *scrollerPath = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:4 yRadius:4];
-
- [[NSColor lightGrayColor] set];
- [scrollerPath fill];
- }
-
-}
-
-- (void)drawArrow:(NSScrollerArrow)arrow highlightPart:(int)flag
-{
- // We don't want arrows
-}
-
-- (void)drawKnobSlotInRect:(NSRect)rect highlight:(BOOL)highlight
-{
-
-}
-
-#endif
@end
+
/*
* Declaration of Mac specific scrollbar structure.
*/
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0e0d8ef..0e3ecf7 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -952,11 +952,6 @@ ExposeRestrictProc(
[super setFrameSize:newSize];
}
-- (void) setNeedsDisplayInRect: (NSRect) invalidRect
-{
- [super setNeedsDisplayInRect:invalidRect];
-}
-
- (BOOL) isOpaque
{
NSWindow *w = [self window];