getWords and scroll motion fixes

karwler · Sep 14, 2018 · cc8fbaa · cc8fbaa
1 parent 8322932
commit cc8fbaa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/engine/scene.cpp b/src/engine/scene.cpp
@@ -170,7 +170,7 @@ void Scene::selectFirst() {
 			lay = lay->getParent();
 		} else if (Layout* next = dynamic_cast<Layout*>(lay->getWidget(id)))
 			lay = next;
-		else if (dynamic_cast<Button*>(lay->getWidget(id))) {
+		else if (lay->getWidget(id)->navSelectable()) {
 			select = lay->getWidget(0);
 			break;
 		} else

diff --git a/src/utils/layouts.cpp b/src/utils/layouts.cpp
@@ -299,6 +299,7 @@ void ScrollArea::onUndrag(uint8 mBut) {
 
 void ScrollArea::onScroll(const vec2i& wMov) {
 	moveListPos(wMov.swap(direction.horizontal()));
+	motion = 0.f;
 }
 
 void ScrollArea::moveListPos(const vec2i& mov) {

diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -7,13 +7,13 @@ static int natCompareRight(const char* a, const char* b) {
 		else if (!isDigit(*a))
 			return -1;
 		else if (!isDigit(*b))
-			return +1;
+			return 1;
 		else if (*a < *b) {
 			if (!bias)
 				bias = -1;
 		} else if (*a > *b) {
 			if (!bias)
-				bias = +1;
+				bias = 1;
 		} else if (!*a  &&  !*b)
 			return bias;
 	}
@@ -27,11 +27,11 @@ static int natCompareLeft(const char* a, const char* b) {
 		else if (!isDigit(*a))
 			return -1;
 		else if (!isDigit(*b))
-			return +1;
+			return 1;
 		else if (*a < *b)
 			return -1;
 		else if (*a > *b)
-			return +1;
+			return 1;
 	}
 	return 0;
 }
@@ -60,7 +60,7 @@ int strnatcmp(const char* a, const char* b) {
 		if (ca < cb)
 			return -1;
 		if (ca > cb)
-			return +1;
+			return 1;
 	}
 }
 
@@ -221,11 +221,11 @@ vector<string> getWords(const string& line) {
 	vector<string> words;
 	while (i < line.length()) {
 		sizt pos = i;
-		while (!isSpace(line[i]))
+		while (!isSpace(line[i]) && i < line.length())
 			i++;
 		words.push_back(line.substr(pos, i - pos));
 
-		while (isSpace(line[i]) && i < line.length())
+		while (isSpace(line[i]))
 			i++;
 	}
 	return words;

diff --git a/src/utils/widgets.cpp b/src/utils/widgets.cpp
@@ -147,7 +147,8 @@ Slider::Slider(const Size& relSize, int value, int minimum, int maximum, PCall l
 	Button(relSize, leftCall, rightCall, doubleCall, background, showBackground, backgroundMargin, parent, id),
 	val(value),
 	vmin(minimum),
-	vmax(maximum)
+	vmax(maximum),
+	diffSliderMouse(0)
 {}
 
 void Slider::drawSelf() {