Added visibility checks to getBaseline() functions.

LGoodDatePicker · Dec 11, 2016 · dbb61f4 · dbb61f4
1 parent 7825487
commit dbb61f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Project/src/main/java/com/github/lgooddatepicker/components/DatePicker.java b/Project/src/main/java/com/github/lgooddatepicker/components/DatePicker.java
@@ -260,7 +260,10 @@ public JButton getComponentToggleCalendarButton() {
      */
     @Override
     public int getBaseline(int width, int height) {
-        return dateTextField.getBaseline(width, height);
+        if (dateTextField.isVisible()) {
+            return dateTextField.getBaseline(width, height);
+        }
+        return super.getBaseline(width, height);
     }
 
     /**

diff --git a/Project/src/main/java/com/github/lgooddatepicker/components/TimePicker.java b/Project/src/main/java/com/github/lgooddatepicker/components/TimePicker.java
@@ -259,7 +259,10 @@ public void closePopup() {
      */
     @Override
     public int getBaseline(int width, int height) {
-        return timeTextField.getBaseline(width, height);
+        if (timeTextField.isVisible()) {
+            return timeTextField.getBaseline(width, height);
+        }
+        return super.getBaseline(width, height);
     }
 
     /**