Skip to content

Commit 5a07817

Browse files
committed
Incremental Search Sidebar Fix
It doesn't completely solve the problem, but at least it doesn't shrink anymore.
1 parent 47eb158 commit 5a07817

6 files changed

Lines changed: 30 additions & 5 deletions

File tree

Binary file not shown.

manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Manifest-Version: 1.0
22
AutoUpdate-Show-In-Client: true
33
OpenIDE-Module: org.jme3.netbeans.plaf.darkmonkey
4-
OpenIDE-Module-Implementation-Version: 1
4+
OpenIDE-Module-Implementation-Version: 2
55
OpenIDE-Module-Install: org/jme3/netbeans/plaf/darkmonkey/Installer.class
66
OpenIDE-Module-Layer: org/jme3/netbeans/plaf/darkmonkey/layer.xml
77
OpenIDE-Module-Localizing-Bundle: org/jme3/netbeans/plaf/darkmonkey/Bundle.properties

nbproject/private/private.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
1414
<group>
1515
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/com/nilo/plaf/nimrod/NimRODComboBoxUI.java</file>
16-
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/DisplayUIDefaultsAction.java</file>
1716
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyLookAndFeel.java</file>
18-
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyValidator.java</file>
17+
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/DMDebugTestBedAction.java</file>
1918
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/Installer.java</file>
19+
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/org/jme3/netbeans/plaf/darkmonkey/DMUtils.java</file>
20+
<file>file:/G:/Archive/NetbeansProjects/JMESuite/DarkMonkey/src/com/nilo/plaf/nimrod/NimRODToolBarUI.java</file>
2021
</group>
2122
</open-files>
2223
</project-private>

src/com/nilo/plaf/nimrod/NimRODComboBoxUI.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public Dimension getMinimumSize( JComponent c) {
8181
Dimension dim = super.getMinimumSize( c);
8282

8383
if ( comboBox.isEditable() ) {
84-
dim.height = editor.getPreferredSize().height - 2;
84+
dim.height = editor.getPreferredSize().height ; // problem is here
8585
}
8686

8787
dim.width += 20;
@@ -103,7 +103,7 @@ public class NimRODComboBoxEditor extends MetalComboBoxEditor {
103103
public NimRODComboBoxEditor() {
104104
super();
105105
editor.setBorder( NimRODBorders.getComboEditorBorder());
106-
}
106+
}
107107
}
108108

109109
private final class NimRODComboBoxButton extends MetalComboBoxButton {
@@ -374,6 +374,7 @@ else if ( !comboBox.isEnabled() ) {
374374

375375
int cWidth = width - (insets.right + iconWidth);
376376

377+
377378
// Fix for 4238829: should lay out the JPanel.
378379
boolean shouldValidate = false;
379380
if (c instanceof JPanel) {
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* To change this license header, choose License Headers in Project Properties.
3+
* To change this template file, choose Tools | Templates
4+
* and open the template in the editor.
5+
*/
6+
package org.jme3.netbeans.plaf.darkmonkey;
7+
8+
import java.awt.event.ActionEvent;
9+
import javax.swing.AbstractAction;
10+
11+
/**
12+
*
13+
* @author charles
14+
*/
15+
public class DMDebugTestBedAction extends AbstractAction{
16+
17+
@Override
18+
public void actionPerformed(ActionEvent e) {
19+
20+
}
21+
22+
}

src/org/jme3/netbeans/plaf/darkmonkey/DarkMonkeyLookAndFeel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ protected void initComponentDefaults( UIDefaults table) {
9999

100100
table.put("Tree.collapsedIcon", DarkMonkeyIconFactory.getTreeCollapsedIcon());
101101
table.put("Tree.expandedIcon", DarkMonkeyIconFactory.getTreeExpandedIcon());
102+
//
102103
/*
103104
for( Enumeration en = table.keys(); en.hasMoreElements(); ) {
104105
System.out.println( "[" + en.nextElement() + "]");

0 commit comments

Comments
 (0)