Bugfix 349: update label shadow size

sdelaysam · Jun 19, 2017 · 39ecb9b · 39ecb9b
1 parent d3feaad
commit 39ecb9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/library/src/main/java/com/github/clans/fab/Label.java b/library/src/main/java/com/github/clans/fab/Label.java
@@ -67,17 +67,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     }
 
     private int calculateMeasuredWidth() {
-        if (mRawWidth == 0) {
-            mRawWidth = getMeasuredWidth();
-        }
-        return getMeasuredWidth() + calculateShadowWidth();
+        mRawWidth = getMeasuredWidth();
+        return mRawWidth + calculateShadowWidth();
     }
 
     private int calculateMeasuredHeight() {
-        if (mRawHeight == 0) {
-            mRawHeight = getMeasuredHeight();
-        }
-        return getMeasuredHeight() + calculateShadowHeight();
+        mRawHeight = getMeasuredHeight();
+        return mRawHeight + calculateShadowHeight();
     }
 
     int calculateShadowWidth() {

diff --git a/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java b/sample/src/main/java/com/github/clans/fab/sample/MenusFragment.java
@@ -42,6 +42,8 @@ public class MenusFragment extends Fragment {
     private List<FloatingActionMenu> menus = new ArrayList<>();
     private Handler mUiHandler = new Handler();
 
+    private boolean mShowLongText = false;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -65,7 +67,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
 
         final FloatingActionButton programFab1 = new FloatingActionButton(getActivity());
         programFab1.setButtonSize(FloatingActionButton.SIZE_MINI);
-        programFab1.setLabelText(getString(R.string.lorem_ipsum));
+        programFab1.setLabelText(getString(mShowLongText ? R.string.lorem_ipsum : R.string.app_name));
         programFab1.setImageResource(R.drawable.ic_edit);
         menuRed.addMenuButton(programFab1);
         programFab1.setOnClickListener(new View.OnClickListener() {
@@ -75,6 +77,8 @@ public void onClick(View v) {
                         ContextCompat.getColor(getActivity(), R.color.light_grey),
                         ContextCompat.getColor(getActivity(), R.color.white_transparent));
                 programFab1.setLabelTextColor(ContextCompat.getColor(getActivity(), R.color.black));
+                programFab1.setLabelText(getString(mShowLongText ? R.string.app_name : R.string.lorem_ipsum));
+                mShowLongText = !mShowLongText;
             }
         });