aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: dragging items to adjacent screens would

Browse Source 
not properly show the available/unavailable cells

Change-Id: I47d1405315db01f87dfcce3536295d2a0d0dc444
This commit is contained in:
Michael Jurka
2010-09-30 12:04:50 -07:00
parent 7c8c8478ba
commit c6ee42e25f
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher2/CellLayout.java
View File

@@ -766,9 +766,9 @@ public class CellLayout extends ViewGroup {
*/
int[] findNearestVacantArea(
int pixelX, int pixelY, int spanX, int spanY, View ignoreView, int[] result) {
if (ignoreView != null) {
markCellsAsUnoccupiedForView(ignoreView);
}
// mark space take by ignoreView as available (method checks if ignoreView is null)
markCellsAsUnoccupiedForView(ignoreView);
// Keep track of best-scoring drop area
final int[] bestXY = result != null ? result : new int[2];
double bestDistance = Double.MAX_VALUE;
@@ -802,9 +802,8 @@ public class CellLayout extends ViewGroup {
}
}
}
if (ignoreView != null) {
markCellsAsOccupiedForView(ignoreView);
}
// re-mark space taken by ignoreView as occupied
markCellsAsOccupiedForView(ignoreView);
// Return null if no suitable location found
if (bestDistance < Double.MAX_VALUE) {
@@ -872,9 +871,8 @@ public class CellLayout extends ViewGroup {
*/
boolean findCellForSpanThatIntersectsIgnoring(int[] cellXY, int spanX, int spanY,
int intersectX, int intersectY, View ignoreView) {
if (ignoreView != null) {
markCellsAsUnoccupiedForView(ignoreView);
}
// mark space take by ignoreView as available (method checks if ignoreView is null)
markCellsAsUnoccupiedForView(ignoreView);
boolean foundCell = false;
while (true) {
@@ -927,9 +925,8 @@ public class CellLayout extends ViewGroup {
}
}
if (ignoreView != null) {
markCellsAsOccupiedForView(ignoreView);
}
// re-mark space taken by ignoreView as occupied
markCellsAsOccupiedForView(ignoreView);
return foundCell;
}
@@ -1123,11 +1120,13 @@ out: for (int i = x; i < x + spanX - 1 && x < xCount; i++) {
}
private void markCellsAsOccupiedForView(View view) {
if (view == null || view.getParent() != this) return;
LayoutParams lp = (LayoutParams) view.getLayoutParams();
markCellsForView(lp.cellX, lp.cellY, lp.cellHSpan, lp.cellVSpan, true);
}
private void markCellsAsUnoccupiedForView(View view) {
if (view == null || view.getParent() != this) return;
LayoutParams lp = (LayoutParams) view.getLayoutParams();
markCellsForView(lp.cellX, lp.cellY, lp.cellHSpan, lp.cellVSpan, false);
}