Only add margin size to preferred size if current size is insufficient.

Fixes #201
weisJ · Aug 5, 2020 · 4597251 · 4597251
1 parent 5af510e
commit 4597251
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFilePane.java b/core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFilePane.java
@@ -98,16 +98,6 @@ public int getNextMatch(final String prefix, final int startIndex, final Positio
                 }
                 return -1;
             }
-
-            @Override
-            protected void paintComponent(final Graphics g) {
-                super.paintComponent(g);
-                // for (Component c = this; c != null; c = c.getParent()) {
-                // System.out.println(c);
-                // System.out.println(c.getBackground());
-                // System.out.println(c.isOpaque());
-                // }
-            }
         };
         list.setCellRenderer(new DarkFileRenderer());
         list.setLayoutOrientation(JList.VERTICAL_WRAP);

diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextUI.java
@@ -229,7 +229,9 @@ public Dimension getPreferredSize(final JComponent c) {
                 dim.height = Math.max(dim.height, prefSize.height);
             }
         }
-        dim.width += getCaretWidth();
+        if (c.getSize().width < dim.width) {
+            dim.width += getCaretWidth();
+        }
         return dim;
     }