From 5540c6436c1cd1e932833a64ea90daed6a74da5e Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Tue, 5 Mar 2019 13:36:56 -0800 Subject: [PATCH] Centered NPC dialog text as good as I can without rewriting TextArea --- core/src/gdx/diablo/widget/NpcDialogBox.java | 1 + core/src/gdx/diablo/widget/ScrollPane.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/gdx/diablo/widget/NpcDialogBox.java b/core/src/gdx/diablo/widget/NpcDialogBox.java index aa0ba298..3fbd27ce 100644 --- a/core/src/gdx/diablo/widget/NpcDialogBox.java +++ b/core/src/gdx/diablo/widget/NpcDialogBox.java @@ -54,6 +54,7 @@ public class NpcDialogBox extends Table implements Disposable { scrollPane.setFlingTime(0); scrollPane.setOverscroll(false, false); scrollPane.setClamp(false); + scrollPane.setScrollX(-15); // FIXME: actual preferred width of text isn't calculated anywhere, this is best guess add(scrollPane).size(330, 128); pack(); diff --git a/core/src/gdx/diablo/widget/ScrollPane.java b/core/src/gdx/diablo/widget/ScrollPane.java index c424402f..07dcee7a 100644 --- a/core/src/gdx/diablo/widget/ScrollPane.java +++ b/core/src/gdx/diablo/widget/ScrollPane.java @@ -445,7 +445,7 @@ public class ScrollPane extends WidgetGroup { maxX -= scrollbarWidth; } } - scrollX(MathUtils.clamp(amountX, 0, maxX)); + scrollX(amountX); scrollY(amountY); // Set the bounds and scroll knob sizes if scrollbars are needed. @@ -522,7 +522,7 @@ public class ScrollPane extends WidgetGroup { y -= (int)(maxY - visualAmountY); float x = widgetAreaBounds.x; - if (scrollX) x -= (int)visualAmountX; + /*if (scrollX) */x -= (int)visualAmountX; if (!fadeScrollBars && scrollbarsOnTop) { if (scrollX && hScrollOnBottom) { @@ -767,7 +767,8 @@ public class ScrollPane extends WidgetGroup { } public void setScrollX (float pixels) { - scrollX(MathUtils.clamp(pixels, 0, maxX)); + //scrollX(MathUtils.clamp(pixels, 0, maxX)); + scrollX(pixels); } /** Returns the x scroll position in pixels, where 0 is the left of the scroll pane. */