Fix to prevent text overlap in options list during scroll

src/client/gui/components/GuiElementContainer.cpp

@@ -35,6 +35,17 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }
 
+bool GuiElementContainer::containsPointInChildren(int x, int y) const {
+	for (std::vector<GuiElement*>::const_iterator it = children.begin(); it != children.end(); ++it) {
+		GuiElement* child = *it;
+		if (child == NULL || !child->visible) continue;
+		if (child->pointInside(x, y)) return true;
+		const GuiElementContainer* container = dynamic_cast<const GuiElementContainer*>(child);
+		if (container != NULL && container->containsPointInChildren(x, y)) return true;
+	}
+	return false;
+}
+
 void GuiElementContainer::tick( Minecraft* minecraft ) {
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->tick(minecraft);

src/client/gui/components/GuiElementContainer.h

@@ -5,16 +5,17 @@
 class Tesselator;
 class Minecraft;
 
-class GuiElementContainer : public GuiElement {
+class GuiElementContainer : public GuiElement {
-public:
+public:
-	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
+	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
-    virtual ~GuiElementContainer();
+    virtual ~GuiElementContainer();
-    virtual void render(Minecraft* minecraft, int xm, int ym);
+    virtual void render(Minecraft* minecraft, int xm, int ym);
-	virtual void setupPositions();
+	virtual void setupPositions();
-	virtual void addChild(GuiElement* element);
+	virtual void addChild(GuiElement* element);
-	virtual void removeChild(GuiElement* element);
+	virtual void removeChild(GuiElement* element);
-
+	bool containsPointInChildren(int x, int y) const;
-	virtual void tick( Minecraft* minecraft );
+
+	virtual void tick( Minecraft* minecraft );
 
 	virtual void mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum );
 	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum );

src/client/gui/components/OptionsGroup.cpp

@@ -1,115 +1,230 @@
-#include "OptionsGroup.h"
+#include "OptionsGroup.h"
-#include "../../Minecraft.h"
+#include "../../Minecraft.h"
-#include "ImageButton.h"
+#include "ImageButton.h"
-#include "OptionsItem.h"
+#include "OptionsItem.h"
-#include "Slider.h"
+#include "Slider.h"
-#include "../../../locale/I18n.h"
+#include "../../../locale/I18n.h"
-#include "TextOption.h"
+#include "TextOption.h"
-#include "KeyOption.h"
+#include "KeyOption.h"
-
+#include <algorithm>
-OptionsGroup::OptionsGroup( std::string labelID )  {
+#include "../Gui.h"
-	label = I18n::get(labelID);
+#include "../Screen.h"
-}
+#include "../../../platform/input/Mouse.h"
-
+#include "../../../util/Mth.h"
-void OptionsGroup::setupPositions() {
+
-	// First we write the header and then we add the items
+OptionsGroup::OptionsGroup( std::string labelID )
-	int curY = y + 18;
+: contentHeight(0),
-	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
+	scrollOffsetY(0.0f),
-		(*it)->width = width - 5;
+	maxScrollOffsetY(0.0f),
-		
+	trackingScrollGesture(false),
-		(*it)->y = curY;
+	scrollingGesture(false),
-		(*it)->x = x + 10;
+	touchDispatched(false),
-		(*it)->setupPositions();
+	dragStartX(0),
-		curY += (*it)->height + 3;
+	dragStartY(0),
-	}
+	lastDragY(0),
-	height = curY;
+	touchStartX(0),
-}
+	touchStartY(0) {
-
+	label = I18n::get(labelID);
-void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
+}
-	float padX = 10.0f;
+
-	float padY = 5.0f;
+void OptionsGroup::setupPositions() {
-	
+	const int labelHeight = 18;
-	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
+	const int bottomPadding = 36;
-
+	const float requestedScroll = scrollOffsetY;
-	super::render(minecraft, xm, ym);
+	const int scrollOffset = (int)requestedScroll;
-}
+	int curY = y + labelHeight - scrollOffset;
-
+	const int contentStartY = y + labelHeight;
-OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
+
-	auto option = minecraft->options.getOpt(optId);
+	// First we write the header and then we add the items
-
+	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
-	if (option == nullptr) return *this;
+		(*it)->width = width - 5;
-
+		
-	// TODO: do a options key class to check it faster via dynamic_cast
+		(*it)->y = curY;
-	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
+		(*it)->x = x + 10;
-	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
+		(*it)->setupPositions();
-	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
+		curY += (*it)->height + 3;
-	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
+	}
-	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
+	curY += bottomPadding;
-
+	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
-	return *this;
+	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
-}
+	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
-
+	if (clampedScroll != requestedScroll) {
-// TODO: wrap this copypaste shit into templates
+		scrollOffsetY = clampedScroll;
-
+		setupPositions();
-void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
+	}
-	ImageDef def;
+}
-
+
-	def.setSrc(IntRectangle(160, 206, 39, 20));
+void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
-	def.name = "gui/touchgui.png";
+	float padX = 10.0f;
-	def.width = 39 * 0.7f;
+	float padY = 5.0f;
-	def.height = 20 * 0.7f;
+	const int labelHeight = 18;
-	
+	
-	OptionButton* element = new OptionButton(optId);
+	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
-	element->setImageDef(def, true);
+
-	element->updateImage(&minecraft->options);
+	glEnable2(GL_SCISSOR_TEST);
-	
+	glScissor(
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+		Gui::GuiScale * x,
-	
+		minecraft->height - Gui::GuiScale * (y + height),
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+		Gui::GuiScale * width,
-	
+		Gui::GuiScale * (height - labelHeight)
-	addChild(item);
+	);
-	setupPositions();
+
-}
+	super::render(minecraft, xm, ym);
-
+	glDisable2(GL_SCISSOR_TEST);
-void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
+}
-	Slider* element = new SliderFloat(minecraft, optId);
+
-	element->width = 100;
+void OptionsGroup::tick(Minecraft* minecraft) {
-	element->height = 20;
+	int xm = Mouse::getX();
-
+	int ym = Mouse::getY();
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	if (minecraft->screen != NULL) {
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+		minecraft->screen->toGUICoordinate(xm, ym);
-	addChild(item);
+	}
-	setupPositions();
+
-}
+	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
-
+
-void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
+	if (trackingScrollGesture && leftDown) {
-	Slider* element = new SliderInt(minecraft, optId);
+		int dy = ym - lastDragY;
-	element->width = 100;
+		int dx = xm - dragStartX;
-	element->height = 20;
+		if (!scrollingGesture) {
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+			int totalDx = xm - dragStartX;
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+			int totalDy = ym - dragStartY;
-	addChild(item);
+			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
-	setupPositions();
+				if (std::abs(totalDy) >= std::abs(totalDx)) {
-}
+					scrollingGesture = true;
-
+				} else if (!touchDispatched) {
-void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
+					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
-	TextBox* element = new TextOption(minecraft, optId);
+					touchDispatched = true;
-	element->width = 100;
+				}
-	element->height = 20;
+			}
-
+		}
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+		if (scrollingGesture && dy != 0) {
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+			scrollByPixels((float)dy);
-	addChild(item);
+		}
-	setupPositions();
+		lastDragY = ym;
-}
+	}
-
+	super::tick(minecraft);
-void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
+}
-	KeyOption* element = new KeyOption(minecraft, optId);
+
-	element->width = 50;
+void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
-	element->height = 20;
+	trackingScrollGesture = false;
-
+	scrollingGesture = false;
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	touchDispatched = false;
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+
-	addChild(item);
+	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
-	setupPositions();
+		trackingScrollGesture = true;
-}
+		dragStartX = x;
+		dragStartY = y;
+		lastDragY = y;
+		touchStartX = x;
+		touchStartY = y;
+		return;
+	}
+
+	super::mouseClicked(minecraft, x, y, buttonNum);
+}
+
+void OptionsGroup::mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {
+	bool wasScrolling = scrollingGesture;
+	bool wasTracking = trackingScrollGesture;
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	if (buttonNum == MouseAction::ACTION_LEFT && wasTracking && !touchDispatched && pointInside(touchStartX, touchStartY)) {
+		super::mouseClicked(minecraft, touchStartX, touchStartY, buttonNum);
+		touchDispatched = true;
+	}
+
+	if (!wasScrolling) {
+		super::mouseReleased(minecraft, x, y, buttonNum);
+	}
+}
+
+void OptionsGroup::scrollByPixels(float deltaY) {
+	if (deltaY == 0.0f || maxScrollOffsetY <= 0.0f) return;
+
+	scrollOffsetY = Mth::clamp(scrollOffsetY - deltaY, 0.0f, maxScrollOffsetY);
+	setupPositions();
+}
+
+bool OptionsGroup::isScrollingGestureActive() const {
+	return trackingScrollGesture || scrollingGesture;
+}
+
+OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
+	auto option = minecraft->options.getOpt(optId);
+
+	if (option == nullptr) return *this;
+
+	// TODO: do a options key class to check it faster via dynamic_cast
+	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
+	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
+	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
+	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
+	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
+
+	return *this;
+}
+
+// TODO: wrap this copypaste shit into templates
+
+void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
+	ImageDef def;
+
+	def.setSrc(IntRectangle(160, 206, 39, 20));
+	def.name = "gui/touchgui.png";
+	def.width = 39 * 0.7f;
+	def.height = 20 * 0.7f;
+	
+	OptionButton* element = new OptionButton(optId);
+	element->setImageDef(def, true);
+	element->updateImage(&minecraft->options);
+	
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderFloat(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderInt(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
+	TextBox* element = new TextOption(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
+	KeyOption* element = new KeyOption(minecraft, optId);
+	element->width = 50;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}

src/client/gui/components/OptionsGroup.h

@@ -11,22 +11,39 @@
 class Font;
 class Minecraft;
 
-class OptionsGroup: public GuiElementContainer {
+class OptionsGroup: public GuiElementContainer {
-	typedef GuiElementContainer super;
+	typedef GuiElementContainer super;
-public:
+public:
-	OptionsGroup(std::string labelID);
+	OptionsGroup(std::string labelID);
-	virtual void setupPositions();
+	virtual void setupPositions();
-	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void render(Minecraft* minecraft, int xm, int ym);
-	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	virtual void tick(Minecraft* minecraft);
-protected:
+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
+	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void scrollByPixels(float deltaY);
+	bool isScrollingGestureActive() const;
+protected:
 
 	void createToggle(OptionId optId, Minecraft* minecraft);
 	void createProgressSlider(OptionId optId, Minecraft* minecraft);
 	void createStepSlider(OptionId optId, Minecraft* minecraft);
 	void createTextbox(OptionId optId, Minecraft* minecraft);
-	void createKey(OptionId optId, Minecraft* minecraft);
+	void createKey(OptionId optId, Minecraft* minecraft);
-
+
-	std::string label;
+	std::string label;
-};
+	int contentHeight;
+	float scrollOffsetY;
+	float maxScrollOffsetY;
+	bool trackingScrollGesture;
+	bool scrollingGesture;
+	bool touchDispatched;
+	int dragStartX;
+	int dragStartY;
+	int lastDragY;
+	int touchStartX;
+	int touchStartY;
+	static const int ScrollStartThreshold = 5;
+};
 
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/

src/client/gui/screens/OptionsScreen.cpp

@@ -121,6 +121,7 @@ void OptionsScreen::setupPositions() {
 			(*it)->x = categoryButtons[0]->width;
 			(*it)->y = bHeader->height;
 			(*it)->width = width - categoryButtons[0]->width;
+			(*it)->height = height - bHeader->height;
 
 			(*it)->setupPositions();
 		}
@@ -253,6 +254,12 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 	super::mouseReleased(x, y, buttonNum);
 }
 
+void OptionsScreen::mouseWheel(int dx, int dy, int xm, int ym) {
+	if (currentOptionsGroup != NULL && currentOptionsGroup->pointInside(xm, ym) && dy != 0) {
+		currentOptionsGroup->scrollByPixels((float)dy * 18.0f);
+	}
+}
+
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);

src/client/gui/screens/OptionsScreen.h

@@ -27,6 +27,7 @@ public:
 
 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
 	virtual void keyPressed(int eventKey);
 	virtual void charPressed(char inputChar);