Commit: 84f38371ddfcf9dc4c708b5b37bb866777ae7298 - Genko (git)

テキストエディタ「原稿」の場所

Commit MetaInfo

• Revision: 84f38371ddfcf9dc4c708b5b37bb866777ae7298 (tree)
• Time: 2012-08-30 09:28:17
• Author: 二鏡 <haliccon@gmai...>
• Commiter: 二鏡

Log Message

色々改善版

Change Summary

• modified: Manuscript/MSFindPanelController.mm
• modified: Manuscript/MSLayoutBlockManager.mm
• modified: Manuscript/MSTextView.mm
• modified: Manuscript/MSTextView_Action.mm
• modified: Manuscript/Manuscript-Info.plist
• modified: Manuscript/_GlyphLocator.mm

Incremental Difference

--- a/Manuscript/MSFindPanelController.mm
+++ b/Manuscript/MSFindPanelController.mm
@@ -256,7 +256,7 @@ static id _sid;
         return NSMakeRange(NSNotFound,0);
     
     CFIndex i;
-    CFIndex first,last;
+    CFIndex first = 0,last = 0;
     for(i=0;i<limit;i++)
     {
         if([invalidIndexes containsIndex: i] == NO)

--- a/Manuscript/MSLayoutBlockManager.mm
+++ b/Manuscript/MSLayoutBlockManager.mm
@@ -378,7 +378,7 @@ _outdatedCharacterRange(NSTextStorage *storage)
     
     CFIndex location = 0;
     CFIndex idx = 0; // block index
-    CFIndex length;
+    CFIndex length = 0;
     
     if(syncCache_.valid())
     {

--- a/Manuscript/MSTextView.mm
+++ b/Manuscript/MSTextView.mm
@@ -208,7 +208,8 @@ static CGFloat cCaretInterval = 0.6;
         return;
     }
     
-    NSPoint point = [self convertPointFromBase: [theEvent locationInWindow]];
+    NSPoint point = [self convertPoint: [theEvent locationInWindow]
+                              fromView: nil];
     _dragState.onSelection = NO;
     
     NSInteger clickCount = [theEvent clickCount];
@@ -283,7 +284,8 @@ static CGFloat cCaretInterval = 0.6;
         return;
     }
     
-    NSPoint point = [self convertPointFromBase: [theEvent locationInWindow]];
+    NSPoint point = [self convertPoint: [theEvent locationInWindow]
+                              fromView: nil];
     
     if(_dragState.onSelection)
     {
@@ -598,9 +600,11 @@ static CGFloat cCaretInterval = 0.6;
     }    
 
     id subString = [storage attributedSubstringFromRange: range];
+    [undoManager disableUndoRegistration];
     [self deleteCharactersInRange: range];
     [self insertText: subString
     replacementRange: NSMakeRange(index,0)];
+    [undoManager enableUndoRegistration];
     
     self.selectedRange = NSMakeRange(index, range.length);
     inputState.reset_selection_anchor();

--- a/Manuscript/MSTextView_Action.mm
+++ b/Manuscript/MSTextView_Action.mm
@@ -868,7 +868,9 @@ readObjectFromPasteboard(NSPasteboard *pboard, Class aClass)
     _dropState.dragging = YES;
 
     BOOL isTail;
-    NSPoint point = [self convertPointFromBase: [sender draggingLocation]];
+//    NSPoint point = [self convertPointFromBase: [sender draggingLocation]];
+    NSPoint point = [self convertPoint: [sender draggingLocation]
+                              fromView: nil];
     caretState.locator = [pager_ indexOfCharacterOfNearestBorderAtPoint: point
                                                                  isTail: &isTail];
 
@@ -905,7 +907,8 @@ readObjectFromPasteboard(NSPasteboard *pboard, Class aClass)
         return NSDragOperationNone;
 
     BOOL isTail;
-    NSPoint point = [self convertPointFromBase: [sender draggingLocation]];
+    NSPoint point = [self convertPoint: [sender draggingLocation]
+                              fromView: nil];
     caretState.locator = [pager_ indexOfCharacterOfNearestBorderAtPoint: point
                                                                  isTail: &isTail];
     if(caretState.locator != NSNotFound)

--- a/Manuscript/Manuscript-Info.plist
+++ b/Manuscript/Manuscript-Info.plist
@@ -52,11 +52,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>f</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSHasLocalizedDisplayName</key>

--- a/Manuscript/_GlyphLocator.mm
+++ b/Manuscript/_GlyphLocator.mm
@@ -48,7 +48,7 @@ void _GlyphBufferSpace::loadStage2metrics(CTFontOrientation orientation)
 {
     CGSize *advance_ptr = &(advances[0]);
     CGSize *translate_ptr = &translations[0];
-    GlyphMetricsCache *storage;
+    GlyphMetricsCache *storage = NULL;
     GlyphMetricsLoader &loader = glyphLoader;
     
     vector<AttributesAdapter>::const_iterator it = target->attributes.begin();
@@ -82,11 +82,14 @@ void _GlyphBufferSpace::loadStage2metrics(CTFontOrientation orientation)
                 advances[i] = metric->advance;
             }
         }
-    }        
-    loader.load(orientation);
-    loader.write_back(translate_ptr, advance_ptr);
-    loader.memory(storage);
-    loader.reset();
+    }
+    if(storage)
+    {
+        loader.load(orientation);
+        loader.write_back(translate_ptr, advance_ptr);
+        loader.memory(storage);
+        loader.reset();
+    }
 }
 
 void _GlyphBufferSpace::loadStage3attributes()