Changeset 486

Timestamp:

10/26/08 06:29:16 (3 years ago)

Author:

szabgab

Message:

move _toggle_numbers to Padre::Wx::Editor

Location:

trunk/lib/Padre/Wx

Files:

• Editor.pm (modified) (1 diff)
• MainWindow.pm (modified) (3 diffs)

trunk/lib/Padre/Wx/Editor.pm

@@ -179 +179 @@
 }
 
+# currently if there are 9 lines we set the margin to 1 width and then
+# if another line is added it is not seen well.
+# actually I added some improvement allowing a 50% growth in the file
+# and requireing a min of 2 width
+sub _toggle_numbers {
+    my ($editor, $on) = @_;
+
+    $editor->SetMarginWidth(1, 0);
+    $editor->SetMarginWidth(2, 0);
+    if ($on) {
+        my $n = 1 + List::Util::max (2, length ($editor->GetLineCount * 2));
+        my $width = $n * $editor->TextWidth(Wx::wxSTC_STYLE_LINENUMBER, "9"); # width of a single character
+        $editor->SetMarginWidth(0, $width);
+        $editor->SetMarginType(0, Wx::wxSTC_MARGIN_NUMBER);
+    } else {
+        $editor->SetMarginWidth(0, 0);
+        $editor->SetMarginType(0, Wx::wxSTC_MARGIN_NUMBER);
+    }
+
+    return;
+}
+
+
 1;

trunk/lib/Padre/Wx/MainWindow.pm

@@ -745 +745 @@
     my $title = $editor->{Document}->get_title;
 
-    $self->_toggle_numbers($editor, $config->{editor_linenumbers});
+    $editor->_toggle_numbers($config->{editor_linenumbers});
     $editor->SetViewEOL($config->{editor_eol});
     $self->set_preferences($editor, $config);
@@ -1100 +1100 @@
 
     foreach my $page ( $self->pages ) {
-        $self->_toggle_numbers( $page, $config->{editor_linenumbers} );
+        $page->_toggle_numbers( $config->{editor_linenumbers} );
     }
 
@@ -1180 +1180 @@
 }
 
-
-# currently if there are 9 lines we set the margin to 1 width and then
-# if another line is added it is not seen well.
-# actually I added some improvement allowing a 50% growth in the file
-# and requireing a min of 2 width
-sub _toggle_numbers {
-    my ($self, $editor, $on) = @_;
-
-    $editor->SetMarginWidth(1, 0);
-    $editor->SetMarginWidth(2, 0);
-    if ($on) {
-        my $n = 1 + List::Util::max (2, length ($editor->GetLineCount * 2));
-        my $width = $n * $editor->TextWidth(Wx::wxSTC_STYLE_LINENUMBER, "9"); # width of a single character
-        $editor->SetMarginWidth(0, $width);
-        $editor->SetMarginType(0, Wx::wxSTC_MARGIN_NUMBER);
-    } else {
-        $editor->SetMarginWidth(0, 0);
-        $editor->SetMarginType(0, Wx::wxSTC_MARGIN_NUMBER);
-    }
-
-    return;
-}
 
 sub convert_to {