From dfb7599bb67326b0ed1ee8d0b0929bc42061253f Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Fri, 4 Dec 2009 11:22:57 -0800 Subject: [PATCH] Remove the cursor hack from CPImageAndTextView, set the cursor globally to the default in CPApplication --- AppKit/CPApplication.j | 3 +++ AppKit/_CPImageAndTextView.j | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index 67ae628cc..d85627b4e 100644 --- a/AppKit/CPApplication.j +++ b/AppKit/CPApplication.j @@ -259,6 +259,9 @@ CPRunContinuesResponse = -1002; // We do it here so that applications can change it in willFinish or didFinishLaunching window.status = " "; + // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam + [[CPCursor arrowCursor] set]; + var bundle = [CPBundle mainBundle], types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"]; diff --git a/AppKit/_CPImageAndTextView.j b/AppKit/_CPImageAndTextView.j index c80fed2e7..c9cddba9c 100644 --- a/AppKit/_CPImageAndTextView.j +++ b/AppKit/_CPImageAndTextView.j @@ -340,7 +340,7 @@ var HORIZONTAL_MARGIN = 3.0, textStyle.position = "absolute"; textStyle.whiteSpace = "pre"; - textStyle.cursor = "default"; + //textStyle.cursor = "default"; textStyle.zIndex = 200; textStyle.overflow = "hidden"; @@ -376,7 +376,7 @@ var HORIZONTAL_MARGIN = 3.0, shadowStyle.font = [_font ? _font : [CPFont systemFontOfSize:12.0] cssString]; shadowStyle.position = "absolute"; shadowStyle.whiteSpace = textStyle.whiteSpace; - shadowStyle.cursor = "default"; + //shadowStyle.cursor = "default"; shadowStyle.zIndex = 150; shadowStyle.textOverflow = textStyle.textOverflow;