Ticket #2623: style.patch

StyledEditWindow.cpp

@@ -31 +31 @@
 #include <Rect.h>
 #include <Roster.h>
 #include <ScrollView.h>
+#include <StringView.h>
 #include <TextControl.h>
 #include <TextView.h>
 #include <TranslationUtils.h>
 
-
 using namespace BPrivate;
 
+const float kLineViewWidth = 30.0;
 
 StyledEditWindow::StyledEditWindow(BRect frame, int32 id, uint32 encoding)
     : BWindow(frame, "untitled", B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
@@ -118 +119 @@
         true, true, B_PLAIN_BORDER);
     AddChild(fScrollView);
     fTextView->MakeFocus(true);
-
+    
+    BScrollBar* HScrollBar = fScrollView->ScrollBar(B_HORIZONTAL);
+    HScrollBar->MoveBy(kLineViewWidth + 1, 0);
+    HScrollBar->ResizeBy((-1 * kLineViewWidth) - 1, 0);
+    
+    fStringView = new BStringView(BRect(0,0,kLineViewWidth,B_H_SCROLL_BAR_HEIGHT), "stringview", "1", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
+    fStringView->SetAlignment(B_ALIGN_CENTER);
+    fScrollView->AddChild(fStringView);
+    fStringView->MoveTo(0.0, HScrollBar->Frame().top);
+    
     // Add "File"-menu:
-
     BMenu* menu = new BMenu("File");
     fMenuBar->AddItem(menu);
 
@@ -533 +542 @@
             fCopyItem->SetEnabled(false);
             fClearItem->SetEnabled(false);
             break;
+        case UPDATE_LINE:
+            char buf[20];
+            sprintf(buf, "%ld", fTextView->CurrentLine() + 1);
+            fStringView->SetText(buf);
+            break;  
         case TEXT_CHANGED:
             if (fUndoFlag) {
                 if (fUndoCleans) {

StyledEditView.cpp

@@ -49 +49 @@
 StyledEditView::Select(int32 start, int32 finish)
 {
     fMessenger->SendMessage(start == finish ? DISABLE_ITEMS : ENABLE_ITEMS);
-
-    BTextView::Select(start, finish);
+    fMessenger->SendMessage(UPDATE_LINE);
+    BTextView::Select(start, finish);   
 }
 
 
@@ -169 +169 @@
         fMessenger-> SendMessage(TEXT_CHANGED);
 
     BTextView::DeleteText(start, finish);
+    fMessenger->SendMessage(UPDATE_LINE);
 }
 
 
@@ -179 +180 @@
     if (!fSuppressChanges)
         fMessenger->SendMessage(TEXT_CHANGED);
 
-    BTextView::InsertText(text, length, offset, runs);  
+    BTextView::InsertText(text, length, offset, runs);
+    fMessenger->SendMessage(UPDATE_LINE);
 }
 
 

StyledEditWindow.h

@@ -15 +15 @@
 #include <String.h>
 #include <Message.h>
 
-
 struct entry_ref;
 
 class BMenu;
@@ -24 +23 @@
 class BMenuItem;
 class BFilePanel;
 class BScrollView;
+class BStringView;
 class StyledEditView;
 
 
@@ -116 +116 @@
 
         StyledEditView  *fTextView;
         BScrollView     *fScrollView;
+        BStringView     *fStringView;
 
         BFilePanel      *fSavePanel;
         BMenu           *fSavePanelEncodingMenu;

Constants.h

@@ -75 +75 @@
 const uint32 SAVE_AS_ENCODING           = 'FPse';
 const uint32 SAVE_THEN_QUIT             = 'FPsq';
 
+// Update Line Info
+const uint32 UPDATE_LINE                = 'UPln';
+
 #endif  // CONSTANTS_H