Merge branch 'master' of github.com:jfoenixadmin/JFoenix

sshahine · Sep 28, 2020 · 35506b7 · 35506b7
2 parents 7f064ca + c54ed66
commit 35506b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -95,13 +95,13 @@ Reference the repository from this location using:
 * Java 9+
     ```groovy
     dependencies {
-        compile 'com.jfoenix:jfoenix:9.0.8'
+        compile 'com.jfoenix:jfoenix:9.0.10'
     }
     ```
 * Java 8
     ```groovy
     dependencies {
-        compile 'com.jfoenix:jfoenix:8.0.8'
+        compile 'com.jfoenix:jfoenix:8.0.10'
     }
     ```
 
@@ -112,15 +112,15 @@ Reference the repository from this location using:
     <dependency>
         <groupId>com.jfoenix</groupId>
         <artifactId>jfoenix</artifactId>
-        <version>9.0.8</version>
+        <version>9.0.10</version>
     </dependency>
     ```
 * Java 8
     ```xml
     <dependency>
         <groupId>com.jfoenix</groupId>
         <artifactId>jfoenix</artifactId>
-        <version>8.0.8</version>
+        <version>8.0.10</version>
     </dependency>
     ```
 # Components

diff --git a/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java b/jfoenix/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java
@@ -1056,10 +1056,9 @@ private void updateSkinnableUI(){
         }
 
         private boolean showCloseButton() {
-            return tab.isClosable() &&
-                   (getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.ALL_TABS));
-//                   ||
-//                    getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.SELECTED_TAB) && tab.isSelected());
+            boolean allTabsPolicy = getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.ALL_TABS);
+            boolean selectedTabPolicy = getSkinnable().getTabClosingPolicy().equals(TabPane.TabClosingPolicy.SELECTED_TAB) && tab.isSelected();
+            return (tab.isClosable() && (allTabsPolicy || selectedTabPolicy));
         }
 
         private void removeListeners() {