external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent cards scrolling off screen after zooming

Browse Source
This commit is contained in:
drdev
2014-05-18 12:31:59 +00:00
parent 91d0c89b8a
commit 0543a2a06d
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -255,15 +255,6 @@ public class MatchScreen extends FScreen {
float yAfter = y * ratio; float yAfter = y * ratio;
setScrollTop(oldScrollTop + yAfter - y); setScrollTop(oldScrollTop + yAfter - y);
//make scroll panes wide enough to support scrolling cards into view
zoom = newScrollHeight / (getHeight() - staticHeight);
for (FScrollPane scrollPane : horzScrollPanes.keySet()) {
float minScrollWidth = scrollPane.getWidth() * zoom;
if (scrollPane.getScrollWidth() < minScrollWidth) {
scrollPane.setScrollWidth(minScrollWidth);
}
}
//adjust scroll left of all horizontal scroll panes to keep x position the same //adjust scroll left of all horizontal scroll panes to keep x position the same
float startX = x; float startX = x;
for (Entry<FScrollPane, Pair<Float, Float>> entry : horzScrollPanes.entrySet()) { for (Entry<FScrollPane, Pair<Float, Float>> entry : horzScrollPanes.entrySet()) {

8
forge-gui-mobile/src/forge/toolbox/FScrollPane.java
View File

@@ -40,18 +40,10 @@ public abstract class FScrollPane extends FContainer {
return scrollBounds.width; return scrollBounds.width;
} }
public void setScrollWidth(float scrollWidth0) {
scrollBounds.width = scrollWidth0;
}
public float getScrollHeight() { public float getScrollHeight() {
return scrollBounds.height; return scrollBounds.height;
} }
public void setScrollHeight(float scrollHeight0) {
scrollBounds.height = scrollHeight0;
}
public float getMaxScrollLeft() { public float getMaxScrollLeft() {
return getScrollWidth() - getWidth(); return getScrollWidth() - getWidth();
} }