modify the marin on the left of the scrollPane because of the issue #4562

Author: CarlosMiguelDesarrollo

app/src/processing/app/Editor.java

@@ -296,7 +296,9 @@ public void windowDeactivated(WindowEvent e) {
 
     // RTextScrollPane
     scrollPane = new RTextScrollPane(textarea, true);
-    scrollPane.setBorder(new MatteBorder(0, 6, 0, 0, Theme.getColor("editor.bgcolor")));
+
+    scrollPane.setBorder(setMargin());
+        
     scrollPane.setViewportBorder(BorderFactory.createEmptyBorder());
     scrollPane.setLineNumbersEnabled(PreferencesData.getBoolean("editor.linenumbers"));
     scrollPane.setIconRowHeaderEnabled(false);
@@ -478,8 +480,12 @@ public void applyPreferences() {
     saveAsMenuItem.setEnabled(!external);
 
     textarea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding"));
+ 
+    scrollPane.setBorder(setMargin());
+
     scrollPane.setFoldIndicatorEnabled(PreferencesData.getBoolean("editor.code_folding"));
     scrollPane.setLineNumbersEnabled(PreferencesData.getBoolean("editor.linenumbers"));
+   
 
     if (external) {
       // disable line highlight and turn off the caret when disabling
@@ -509,6 +515,37 @@ public void applyPreferences() {
 
   }
 
+  private MatteBorder setMargin()
+  {
+    int defaultMargin = 29;
+    int marginwithNumbers = 6;
+    int marginWithFoldingCode = 17;
+    int marginWithBoth = 1;
+
+    MatteBorder formatedMargin;
+    if(PreferencesData.getBoolean("editor.linenumbers") && PreferencesData.getBoolean("editor.code_folding"))
+    {
+      
+      formatedMargin = new MatteBorder(0, marginWithBoth, 0, 0, Theme.getColor("editor.bgcolor"));
+    }
+    else if(PreferencesData.getBoolean("editor.linenumbers"))
+    {
+      
+      formatedMargin = new MatteBorder(0, marginwithNumbers, 0, 0, Theme.getColor("editor.bgcolor"));
+    }
+    else if(PreferencesData.getBoolean("editor.code_folding"))
+    {
+      
+      formatedMargin = new MatteBorder(0, marginWithFoldingCode, 0, 0, Theme.getColor("editor.bgcolor"));
+    }  
+    else
+    {
+      formatedMargin = new MatteBorder(0, defaultMargin, 0, 0, Theme.getColor("editor.bgcolor"));
+    }
+
+    return formatedMargin;
+  }
+
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
@@ -743,13 +780,13 @@ public void actionPerformed(ActionEvent e) {
       });
     sketchMenu.add(item);
 
-//    item = new JMenuItem("Stop");
-//    item.addActionListener(new ActionListener() {
-//        public void actionPerformed(ActionEvent e) {
-//          handleStop();
-//        }
-//      });
-//    sketchMenu.add(item);
+  //    item = new JMenuItem("Stop");
+  //    item.addActionListener(new ActionListener() {
+  //        public void actionPerformed(ActionEvent e) {
+  //          handleStop();
+  //        }
+  //      });
+  //    sketchMenu.add(item);
 
     sketchMenu.addSeparator();
 
@@ -1402,23 +1439,23 @@ public void actionPerformed(ActionEvent e) {
     JMenuItem copyForumItem = newJMenuItemShift(tr("Copy for Forum"), 'C');
     copyForumItem.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-//          SwingUtilities.invokeLater(new Runnable() {
-//              public void run() {
+    //          SwingUtilities.invokeLater(new Runnable() {
+    //              public void run() {
           new DiscourseFormat(Editor.this, false).show();
-//              }
-//            });
+    //              }
+    //            });
         }
       });
     menu.add(copyForumItem);
 
     JMenuItem copyHTMLItem = newJMenuItemAlt(tr("Copy as HTML"), 'C');
     copyHTMLItem.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-//          SwingUtilities.invokeLater(new Runnable() {
-//              public void run() {
+    //          SwingUtilities.invokeLater(new Runnable() {
+    //              public void run() {
           new DiscourseFormat(Editor.this, true).show();
-//              }
-//            });
+    //              }
+    //            });
         }
       });
     menu.add(copyHTMLItem);
@@ -1701,18 +1738,18 @@ public void setText(String what) {
    * Called to update the text but not switch to a different set of code
    * (which would affect the undo manager).
    */
-//  public void setText2(String what, int start, int stop) {
-//    beginCompoundEdit();
-//    textarea.setText(what);
-//    endCompoundEdit();
-//
-//    // make sure that a tool isn't asking for a bad location
-//    start = Math.max(0, Math.min(start, textarea.getDocumentLength()));
-//    stop = Math.max(0, Math.min(start, textarea.getDocumentLength()));
-//    textarea.select(start, stop);
-//
-//    textarea.requestFocus();  // get the caret blinking
-//  }
+  //  public void setText2(String what, int start, int stop) {
+  //    beginCompoundEdit();
+  //    textarea.setText(what);
+  //    endCompoundEdit();
+  //
+  //    // make sure that a tool isn't asking for a bad location
+  //    start = Math.max(0, Math.min(start, textarea.getDocumentLength()));
+  //    stop = Math.max(0, Math.min(start, textarea.getDocumentLength()));
+  //    textarea.select(start, stop);
+  //
+  //    textarea.requestFocus();  // get the caret blinking
+  //  }
 
 
   public String getSelectedText() {
@@ -1783,7 +1820,7 @@ protected void setCode(final SketchCodeDocument codeDoc) {
         bl.printStackTrace();
       }
       // set up this guy's own undo manager
-//      code.undo = new UndoManager();
+  //      code.undo = new UndoManager();
 
       codeDoc.setDocument(document);
     }
@@ -2010,12 +2047,12 @@ public void run() {
    * Implements Sketch → Stop, or pressing Stop on the toolbar.
    */
   private void handleStop() {  // called by menu or buttons
-//    toolbar.activate(EditorToolbar.STOP);
+  //    toolbar.activate(EditorToolbar.STOP);
 
     internalCloseRunner();
 
     toolbar.deactivateRun();
-//    toolbar.deactivate(EditorToolbar.STOP);
+  //    toolbar.deactivate(EditorToolbar.STOP);
 
     // focus the PDE again after quitting presentation mode [toxi 030903]
     toFront();
@@ -2874,10 +2911,10 @@ public void statusError(String what) {
    */
   public void statusError(Exception e) {
     e.printStackTrace();
-//    if (e == null) {
-//      System.err.println("Editor.statusError() was passed a null exception.");
-//      return;
-//    }
+  //    if (e == null) {
+  //      System.err.println("Editor.statusError() was passed a null exception.");
+  //      return;
+  //    }
 
     if (e instanceof RunnerException) {
       RunnerException re = (RunnerException) e;
@@ -2923,7 +2960,7 @@ public void statusError(Exception e) {
       }
       statusError(mess);
     }
-//    e.printStackTrace();
+  //    e.printStackTrace();
   }