From e396ea6f873dc2145aca286bd98b240edf76aa12 Mon Sep 17 00:00:00 2001 From: Marcos Backes Date: Tue, 19 Feb 2019 17:02:30 -0300 Subject: [PATCH 1/3] Fixed bug which causes ImagePanel to highlight images when it shouldn't --- src/imagepanel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/imagepanel.cpp b/src/imagepanel.cpp index c213e3b6fa..0ebc21320d 100644 --- a/src/imagepanel.cpp +++ b/src/imagepanel.cpp @@ -33,6 +33,7 @@ int ImagePanel::indexForPosition(const Vector2i &p) const { float iconRegion = mThumbSize / (float)(mThumbSize + mSpacing); bool overImage = pp.x() - std::floor(pp.x()) < iconRegion && pp.y() - std::floor(pp.y()) < iconRegion; + overImage &= pp.x() >= 0 && pp.y() >= 0; Vector2i gridPos = pp.cast(), grid = gridSize(); overImage &= ((gridPos.array() >= 0).all() && (gridPos.array() < grid.array()).all()); From 94167835522ed46d4a86cbce6968dfdd988f9f38 Mon Sep 17 00:00:00 2001 From: Marcos Backes Date: Tue, 12 Mar 2019 17:05:12 -0300 Subject: [PATCH 2/3] using updated glfw --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index cc0182210a..08231f3738 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "ext/nanovg"] path = ext/nanovg url = https://github.com/wjakob/nanovg -[submodule "ext/glfw"] - path = ext/glfw - url = https://github.com/wjakob/glfw [submodule "ext/glew"] path = ext/glew url = https://github.com/nigels-com/glew @@ -13,3 +10,6 @@ [submodule "ext/pybind"] path = ext/pybind11 url = https://github.com/pybind/pybind11 +[submodule "ext/glfw"] + path = ext/glfw + url = https://github.com/mhbackes/glfw From a179218c4529fd234acd2f9c302b134252bb76a0 Mon Sep 17 00:00:00 2001 From: Marcos Backes Date: Tue, 12 Mar 2019 17:10:20 -0300 Subject: [PATCH 3/3] Updated glfw to latest commit --- ext/glfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/glfw b/ext/glfw index 0ff30d6485..de358ffe65 160000 --- a/ext/glfw +++ b/ext/glfw @@ -1 +1 @@ -Subproject commit 0ff30d648506e19a1c54a2b2a2d09c4e59b86922 +Subproject commit de358ffe6553bf2470628a9ea9f9b2414317833e