Ticket #3651: 3651-Enh1.patch

src/apps/charactermap/CharacterView.cpp

@@ -108 +108 @@
 void
 CharacterView::ScrollToBlock(int32 blockIndex)
 {
+    // don't scroll if the selected character is already in view.
+    // this prevents distracting jumps when crossing a block 
+    // boundary in the character view.
+    if (IsCharacterVisible(fCurrentCharacter))
+        return;
+        
     if (blockIndex < 0)
         blockIndex = 0;
     else if (blockIndex >= (int32)kNumUnicodeBlocks)

src/apps/charactermap/CharacterWindow.cpp

@@ -337 +337 @@
 
             fGlyphView->SetText(glyph);
             fCodeView->SetText(text);
+            
+            fUnicodeBlockView->SelectBlockForCharacter(character);
             break;
         }
 

src/apps/charactermap/UnicodeBlockView.cpp

@@ -118 +118 @@
     _UpdateBlocks();
 }
 
+
+void
+UnicodeBlockView::SelectBlockForCharacter(uint32 character)
+{
+    // find block containing the character
+
+    // TODO: could use binary search here
+    for (uint32 i = 0; i < kNumUnicodeBlocks; i++) {
+        if (kUnicodeBlocks[i].end < character)
+            continue;
+        if (kUnicodeBlocks[i].start > character) {
+            // Character is not mapped
+            break;
+        }
+
+        Select(i);
+        ScrollToSelection();
+    }
+}

src/apps/charactermap/UnicodeBlockView.h

@@ -40 +40 @@
                                 { return fShowContainedBlocksOnly; }
 
             bool            IsShowingBlock(int32 blockIndex) const;
+            void            SelectBlockForCharacter(uint32 character);
 
 private:
             void            _UpdateBlocks();