Fix calculations

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
index e425237..ac3f5b7 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
@@ -681,11 +681,15 @@ public class TaskbarService extends Service {
                             if(U.getTaskbarPosition(TaskbarService.this).contains("vertical")) {
                                 float maxScreenSize = metrics.heightPixels - U.getStatusBarHeight(TaskbarService.this);
 
-                                params.height = (int) Math.min(getResources().getDimensionPixelSize(R.dimen.icon_size) * numOfEntries, maxScreenSize - getResources().getDimensionPixelSize(R.dimen.base_taskbar_size));
+                                params.height = (int) Math.min(getResources().getDimensionPixelSize(R.dimen.icon_size) * numOfEntries,
+                                        maxScreenSize - getResources().getDimensionPixelSize(R.dimen.base_taskbar_size))
+                                        + getResources().getDimensionPixelSize(R.dimen.divider_size);
                             } else {
                                 float maxScreenSize = metrics.widthPixels;
 
-                                params.width = (int) Math.min(getResources().getDimensionPixelSize(R.dimen.icon_size) * numOfEntries, maxScreenSize - getResources().getDimensionPixelSize(R.dimen.base_taskbar_size));
+                                params.width = (int) Math.min(getResources().getDimensionPixelSize(R.dimen.icon_size) * numOfEntries,
+                                        maxScreenSize - getResources().getDimensionPixelSize(R.dimen.base_taskbar_size))
+                                        + getResources().getDimensionPixelSize(R.dimen.divider_size);
                             }
 
                             scrollView.setLayoutParams(params);
@@ -732,10 +736,8 @@ public class TaskbarService extends Service {
         startButton.setVisibility(View.VISIBLE);
         space.setVisibility(View.VISIBLE);
 
-        if(isShowingRecents) {
-            if(scrollView.getVisibility() == View.GONE)
-                scrollView.setVisibility(View.INVISIBLE);
-        }
+        if(isShowingRecents && scrollView.getVisibility() == View.GONE)
+            scrollView.setVisibility(View.INVISIBLE);
 
         shouldRefreshRecents = true;
         startRefreshingRecents();

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3c6e3e9..d5ff65f 100644 (file)
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,4 +31,5 @@
     <dimen name="app_drawer_icon_padding">4dp</dimen>
     <dimen name="app_drawer_icon_padding_alt">7dp</dimen>
     <dimen name="base_taskbar_size">92dp</dimen>
+    <dimen name="divider_size">5dp</dimen>
 </resources>