fixed scrollview

7thFACTOR · Aug 29, 2018 · 6da2d08 · 6da2d08
1 parent fc35d19
commit 6da2d08
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/examples/common/sfml_input_provider.h b/examples/common/sfml_input_provider.h
@@ -1,6 +1,5 @@
 #include "horus.h"
 #include <horus_interfaces.h>
-#define SFML_STATIC
 #include <SFML/System.hpp>
 #include <SFML/Window.hpp>
 #include <SFML/OpenGL.hpp>

diff --git a/generate.cmd b/generate.cmd
@@ -1,3 +1,5 @@
 set VSVER=vs2017
 IF EXIST vs2015 set VSVER=vs2015
-premake5 %VSVER%
+premake5 %VSVER%
+
+xcopy .\3rdparty\sfml\win64\bin\*.* .\bin /c /q /i /e /h /y
diff --git a/premake5.lua b/premake5.lua
@@ -253,18 +253,18 @@ function link_sfml()
 		includedirs {scriptRoot.."/3rdparty/sfml/win64/include"}
 		libdirs {scriptRoot.."/3rdparty/sfml/win64/lib"}
 		filter { "system:windows", "configurations:Debug" }
-			links { "freetype", "sfml-window-s-d", "sfml-system-s-d", "sfml-graphics-s-d", "sfml-audio-s-d" }
+			links { "freetype", "sfml-window-d", "sfml-system-d", "sfml-graphics-d", "sfml-audio-d" }
 		filter { "system:windows", "configurations:Release" }
-			links { "freetype", "sfml-window-s", "sfml-system-s", "sfml-graphics-s", "sfml-audio-s" }
+			links { "freetype", "sfml-window", "sfml-system", "sfml-graphics", "sfml-audio" }
 	filter {}
 
 	filter {"system:linux"}
 		includedirs {scriptRoot.."/3rdparty/sfml/linux/include"}
 		libdirs {scriptRoot.."/3rdparty/sfml/linux/lib"}
 		filter { "system:linux", "configurations:Debug" }
-			links { "freetype", "sfml-window-s-d", "sfml-system-s-d", "sfml-graphics-s-d", "sfml-audio-s-d" }
+			links { "freetype", "sfml-window-d", "sfml-system-d", "sfml-graphics-d", "sfml-audio-d" }
 		filter { "system:linux", "configurations:Release" }
-			links { "freetype", "sfml-window-s", "sfml-system-s", "sfml-graphics-s", "sfml-audio-s" }
+			links { "freetype", "sfml-window", "sfml-system", "sfml-graphics", "sfml-audio" }
 	filter {}
 
 	filter {"system:macosx"}

diff --git a/src/native_dialogs.cpp b/src/native_dialogs.cpp
@@ -4,6 +4,7 @@
 #include "util.h"
 #include "3rdparty/nativefiledialog/src/include/nfd.h"
 #include <string.h>
+#include <algorithm>
 
 namespace hui
 {

diff --git a/src/scrollview_widget.cpp b/src/scrollview_widget.cpp
@@ -160,7 +160,8 @@ f32 endScrollView()
 				}
 			}
 		}
-		else if (ctx->scrollViewStack[ctx->scrollViewDepth].draggingThumb
+		else if (ctx->mouseMoved
+            && ctx->scrollViewStack[ctx->scrollViewDepth].draggingThumb
 			&& ctx->dragScrollViewHandleWidgetId == ctx->scrollViewStack[ctx->scrollViewDepth].widgetId)
 		{
 			f32 crtLocalY = ctx->event.mouse.point.y - ctx->scrollViewStack[ctx->scrollViewDepth].dragDelta.y - clipRect.y;