Fix merge issue

rubensousa · Feb 28, 2017 · 5227a6f · 5227a6f
1 parent e2fa965
commit 5227a6f
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/floatingtoolbar/src/main/java/com/github/rubensousa/floatingtoolbar/FloatingToolbar.java b/floatingtoolbar/src/main/java/com/github/rubensousa/floatingtoolbar/FloatingToolbar.java
@@ -119,7 +119,7 @@ public FloatingToolbar(Context context, AttributeSet attrs, int defStyleAttr) {
         int customView = a.getResourceId(R.styleable.FloatingToolbar_floatingCustomView, 0);
 
         if (customView != 0) {
-            mCustomView = LayoutInflater.from(context).inflate(customView, this, true);
+            mCustomView = LayoutInflater.from(context).inflate(customView, this, false);
         }
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
@@ -129,6 +129,7 @@ public FloatingToolbar(Context context, AttributeSet attrs, int defStyleAttr) {
         }
 
         if (mCustomView != null) {
+            addView(mCustomView);
             mAnimator.setContentView(mCustomView);
         }
 
@@ -516,12 +517,18 @@ private void addMenuItems() {
 
     void dispatchShow() {
         mShowing = true;
-        mAnimating = true;
-
-        mAnimator.show();
 
-        for (MorphListener morphListener : mMorphListeners) {
-            morphListener.onMorphStart();
+        if (getWidth() == 0 && getHeight() == 0) {
+            setVisibility(View.VISIBLE);
+            if (mFab != null) {
+                mFab.setVisibility(View.INVISIBLE);
+            }
+        } else {
+            mAnimating = true;
+            mAnimator.show();
+            for (MorphListener morphListener : mMorphListeners) {
+                morphListener.onMorphStart();
+            }
         }
     }