Changeset 860

Timestamp:

11/09/08 14:49:52 (3 years ago)

Author:

hjansen

Message:

• First shot at activating code folding feature of wxStyledTextCtrl: Usable but not well tested

Location:

trunk/lib/Padre/Wx

Files:

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

trunk/lib/Padre/Wx/Editor.pm

@@ -172 +172 @@
 
     $self->SetMarginWidth(1, 0);
-    $self->SetMarginWidth(2, 0);
+    #$self->SetMarginWidth(2, 0);
 
     # premature optimization, caching the with that was on the 3rd place at load time
@@ -190 +190 @@
 }
 
+# Just a placeholder
+sub show_symbols {
+    my ( $self, $on ) = @_;
+
+    $self->SetMarginWidth(1, 0);
+
+    # $self->SetMarginWidth(1, 16);   #margin 1 for symbols, 16 px wide
+    # $self->SetMarginType(1, Wx::wxSTC_MARGIN_SYMBOL);
+
+    return;
+}
+
+sub show_folding {
+    my ( $self, $on ) = @_;
+
+    if ( $on ) {
+        # Setup a margin to hold fold markers
+        $self->SetMarginType(2, Wx::wxSTC_MARGIN_SYMBOL); # margin number 2 for symbols
+        $self->SetMarginMask(2, Wx::wxSTC_MASK_FOLDERS);  # set up mask for folding symbols
+        $self->SetMarginSensitive(2, 1);                  # this one needs to be mouse-aware
+        $self->SetMarginWidth(2, 16);                     # set margin 2 16 px wide
+
+        # define folding markers
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDEREND,     Wx::wxSTC_MARK_BOXPLUSCONNECTED,  Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDEROPENMID, Wx::wxSTC_MARK_BOXMINUSCONNECTED, Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDERMIDTAIL, Wx::wxSTC_MARK_TCORNER,  Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDERTAIL,    Wx::wxSTC_MARK_LCORNER,  Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDERSUB,     Wx::wxSTC_MARK_VLINE,    Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDER,        Wx::wxSTC_MARK_BOXPLUS,  Wx::Colour->new("white"), Wx::Colour->new("black"));
+        $self->MarkerDefine(Wx::wxSTC_MARKNUM_FOLDEROPEN,    Wx::wxSTC_MARK_BOXMINUS, Wx::Colour->new("white"), Wx::Colour->new("black"));
+
+        # activate 
+        $self->SetProperty('fold' => 1);
+
+        Wx::Event::EVT_STC_MARGINCLICK(
+            $self,
+            Wx::wxID_ANY,
+            sub {
+                my ( $editor, $event ) = @_;
+                if ( $event->GetMargin() == 2 ) {
+                    my $line_clicked = $editor->LineFromPosition( $event->GetPosition() );
+                    my $level_clicked = $editor->GetFoldLevel($line_clicked);
+                    # TODO check this (cf. ~/contrib/samples/stc/edit.cpp from wxWidgets)
+                    #if ( $level_clicked && wxSTC_FOLDLEVELHEADERFLAG) > 0) {
+                        $editor->ToggleFold($line_clicked);
+                    #}
+                }
+            }
+        );
+    }
+    else {
+        $self->SetMarginSensitive(2, 0);
+        $self->SetMarginWidth(2, 0);
+        # deactivate
+        $self->SetProperty('fold' => 1);
+    }
+
+    return;
+}
+
 sub set_preferences {
     my ($self) = @_;
@@ -196 +256 @@
 
     $self->show_line_numbers(    $config->{editor_linenumbers}       );
+    $self->show_folding(         $config->{editor_codefolding}       );
     $self->SetIndentationGuides( $config->{editor_indentationguides} );
     $self->SetViewEOL(           $config->{editor_eol}               );

trunk/lib/Padre/Wx/MainWindow.pm

@@ -1312 +1312 @@
 }
 
+sub on_toggle_code_folding {
+    my ($self, $event) = @_;
+
+    my $config = Padre->ide->config;
+    $config->{editor_codefolding} = $event->IsChecked ? 1 : 0;
+
+    foreach my $editor ( $self->pages ) {
+        $editor->show_folding( $config->{editor_codefolding} );
+    }
+
+    return;
+}
+
 sub on_toggle_indentation_guide {
     my $self   = shift;

trunk/lib/Padre/Wx/Menu.pm

@@ -298 +298 @@
         $menu->{view_lines},
         \&Padre::Wx::MainWindow::on_toggle_line_numbers,
+    );
+    $menu->{view_folding} = $menu->{view}->AppendCheckItem( -1, gettext("Show code folding") );
+    Wx::Event::EVT_MENU( $win,
+        $menu->{view_folding},
+        \&Padre::Wx::MainWindow::on_toggle_code_folding,
     );
     $menu->{view_eol} = $menu->{view}->AppendCheckItem( -1, gettext("Show Newlines") );
@@ -578 +583 @@
     # Setup menu state from configuration
     $menu->{view_lines}->Check( $config->{editor_linenumbers} ? 1 : 0 );
+    $menu->{view_folding}->Check( $config->{editor_codefolding} ? 1 : 0 );
     $menu->{view_eol}->Check( $config->{editor_eol} ? 1 : 0 );
     unless ( Padre::Util::WIN32 ) {