OSDN Git Service

Fix history panel overlap
authornicolasroard <nicolasroard@google.com>
Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)
committernicolasroard <nicolasroard@google.com>
Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)
bug:7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d

src/com/android/gallery3d/filtershow/FilterShowActivity.java

index e02a751..ae07b06 100644 (file)
@@ -465,6 +465,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         if (mainPanelWidth == 0) {
             mainPanelWidth = mainViewWidth;
         }
+        int filtersPanelWidth = findViewById(R.id.filtersPanel).getWidth();
+        if (mainPanelWidth < filtersPanelWidth) {
+            mainPanelWidth = filtersPanelWidth;
+        }
         int leftOver = mainViewWidth - mainPanelWidth - accessoryPanelWidth;
         if (leftOver < 0) {
             return -accessoryPanelWidth;