From 916b09fc4c96f1c35fb485e849c4dd636e2282fc Mon Sep 17 00:00:00 2001 From: Bibiko Date: Thu, 27 Aug 2009 07:54:26 +0000 Subject: =?UTF-8?q?=E2=80=A2=20SPFieldEditorSheet=20-=20ESC=20and=20ENTER?= =?UTF-8?q?=20will=20close=20a=20non-editable=20sheet=20*=20SPTooltip=20-?= =?UTF-8?q?=20first=20check=20if=20tooltip=20should=20be=20closed=20and=20?= =?UTF-8?q?then=20forward=20the=20current=20event=20(this=20fixes=20an=20i?= =?UTF-8?q?ssue=20if=20a=20tooltip=20is=20shown=20while=20a=20modal=20wind?= =?UTF-8?q?ow=20appears=20which=20could=20block=20the=20closing=20of=20the?= =?UTF-8?q?=20tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPFieldEditorController.h | 1 + Source/SPFieldEditorController.m | 4 ++-- Source/SPTooltip.m | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Source') diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h index 262066a6..97edd4b3 100644 --- a/Source/SPFieldEditorController.h +++ b/Source/SPFieldEditorController.h @@ -36,6 +36,7 @@ IBOutlet id hexTextScrollView; IBOutlet id editSheet; IBOutlet id editSheetCancelButton; + IBOutlet id editSheetIsNotEditableCancelButton; IBOutlet id editSheetOkButton; IBOutlet id editSheetOpenButton; IBOutlet id editSheetFieldName; diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m index deb3ce32..de7e87c4 100644 --- a/Source/SPFieldEditorController.m +++ b/Source/SPFieldEditorController.m @@ -97,9 +97,9 @@ [editTextScrollView setHidden:YES]; if(!isEditable) { - [editSheetOkButton setTitle:NSLocalizedString(@"Close", @"close button title")]; - [editSheetOkButton setKeyEquivalent:@"\033"]; // ESC key + [editSheetOkButton setHidden:YES]; [editSheetCancelButton setHidden:YES]; + [editSheetIsNotEditableCancelButton setHidden:NO]; [editSheetOpenButton setEnabled:NO]; } diff --git a/Source/SPTooltip.m b/Source/SPTooltip.m index 64842427..0c84061b 100644 --- a/Source/SPTooltip.m +++ b/Source/SPTooltip.m @@ -389,7 +389,6 @@ static float slow_in_out (float t) int eventType; while(event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:YES]) { - [NSApp sendEvent:event]; eventType = [event type]; if(eventType == NSKeyDown || eventType == NSLeftMouseDown || eventType == NSRightMouseDown || eventType == NSOtherMouseDown || eventType == NSScrollWheel) break; @@ -402,6 +401,8 @@ static float slow_in_out (float t) if(spTooltipCounter > 1) break; + [NSApp sendEvent:event]; + } [keyWindow setAcceptsMouseMovedEvents:didAcceptMouseMovedEvents]; -- cgit v1.2.3