diff options
author | Adam Cohen <adamcohen@google.com> | 2011-06-30 17:05:14 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-06-30 17:22:07 -0700 |
commit | 0e4857c302da6adbd45231d7a8bae0289fa33250 (patch) | |
tree | 8b3099321c2e70701a0652246cd811d365f62c90 /src/com/android/launcher2/Folder.java | |
parent | 6a0f57dfafced837a2a282d8feec28d5418be3b9 (diff) | |
download | android_packages_apps_Trebuchet-0e4857c302da6adbd45231d7a8bae0289fa33250.tar.gz android_packages_apps_Trebuchet-0e4857c302da6adbd45231d7a8bae0289fa33250.tar.bz2 android_packages_apps_Trebuchet-0e4857c302da6adbd45231d7a8bae0289fa33250.zip |
Fixing small folder bugs
-> Issue 4972348
-> Center folder when it extends beyond the workspace
Change-Id: Id5551d17d595151bfd27122e1fd4ddfeab7dbf40
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index da859cb8e..89e4603da 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -744,6 +744,12 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL int left = Math.min(Math.max(0, centeredLeft), parentWidth - width); int top = Math.min(Math.max(0, centeredTop), parentHeight - height); + if (width >= parentWidth) { + left = (parentWidth - width) / 2; + } + if (height >= parentHeight) { + top = (parentHeight - height) / 2; + } int folderPivotX = width / 2 + (centeredLeft - left); int folderPivotY = height / 2 + (centeredTop - top); |