[hg] main-silver: #222413 - Patch for: Editor: Search/Replace-Ba...

  • From: Milutin Kristofic < >
  • To:
  • Subject: [hg] main-silver: #222413 - Patch for: Editor: Search/Replace-Ba...
  • Date: Wed, 21 Nov 2012 10:06:22 -0800

changeset 8e58ce3b30a2 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/8e58ce3b30a2
description:
        #222413 - Patch for: Editor: Search/Replace-Bar uses non 
standard-background color

diffstat:

 editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java         
  |  6 ------
 editor.search/src/org/netbeans/modules/editor/search/SearchBar.java          
  |  6 ------
 
editor.search/src/org/netbeans/modules/editor/search/SearchComboBoxEditor.java
 |  1 -
 3 files changed, 0 insertions(+), 13 deletions(-)

diffs (54 lines):

diff --git 
a/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java 
b/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
--- a/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
@@ -90,17 +90,11 @@
 
         setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
         setFocusCycleRoot(true);
-        Color bgColor = getBackground();
-        bgColor = new Color(Math.max(0, bgColor.getRed() - 20),
-                Math.max(0, bgColor.getGreen() - 20),
-                Math.max(0, bgColor.getBlue() - 20));
-        setBackground(bgColor);
         setForeground(UIManager.getColor("textText")); //NOI18N
 
         // padding at the end of the toolbar
         add(Box.createHorizontalStrut(8)); //spacer in the beginnning of the 
toolbar
         SearchComboBox scb = new SearchComboBox();
-        scb.getEditor().getEditorComponent().setBackground(bgColor);
         replaceComboBox = scb;
         replaceComboBox.addPopupMenuListener(new ReplacePopupMenuListener());
         replaceTextField = scb.getEditorPane();
diff --git 
a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java 
b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
--- a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
@@ -148,18 +148,12 @@
         addEscapeKeystrokeFocusBackTo(this);
         setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
         setFocusCycleRoot(true);
-        Color bgColor = getBackground();
-        bgColor = new Color(Math.max(0, bgColor.getRed() - 20),
-                Math.max(0, bgColor.getGreen() - 20),
-                Math.max(0, bgColor.getBlue() - 20));
-        setBackground(bgColor);
         setForeground(DEFAULT_FG_COLOR); //NOI18N
 
         add(Box.createHorizontalStrut(8)); //spacer in the beginnning of the 
toolbar
 
         SearchComboBox scb = new SearchComboBox();
         incSearchComboBox = scb;
-        scb.getEditor().getEditorComponent().setBackground(bgColor);
         incSearchComboBox.setFocusable(false);
         incSearchComboBox.addPopupMenuListener(new 
SearchPopupMenuListener());
         incSearchTextField = scb.getEditorPane();
diff --git 
a/editor.search/src/org/netbeans/modules/editor/search/SearchComboBoxEditor.java
 
b/editor.search/src/org/netbeans/modules/editor/search/SearchComboBoxEditor.java
--- 
a/editor.search/src/org/netbeans/modules/editor/search/SearchComboBoxEditor.java
+++ 
b/editor.search/src/org/netbeans/modules/editor/search/SearchComboBoxEditor.java
@@ -184,7 +184,6 @@
                     }
                 });
         editorPane.setBorder(new EmptyBorder (0, 0, 0, 0));
-        editorPane.setBackground(referenceTextField.getBackground());
         LOG.log(Level.FINE, "Changed editorkit - Set Font: Name: {0}, Size: 
{1}\n", new Object[]{editorPane.getFont().getFontName(), 
editorPane.getFont().getSize()}); //NOI18N
         editorPane.setFont(referenceTextField.getFont());
         LOG.log(Level.FINE, "Changed editorkit - Set Font: Name: {0}, Size: 
{1}\n", new Object[]{editorPane.getFont().getFontName(), 
editorPane.getFont().getSize()}); //NOI18N

[hg] main-silver: #222413 - Patch for: Editor: Search/Replace-Ba...

Milutin Kristofic 11/21/2012

Project Features

About this Project

Editor was started in November 2009, is owned by Martin Ryzl, and has 147 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close