diff --git a/drawables/MusicApp/Screenshots/1.jpg b/drawables/MusicApp/Screenshots/1.jpg index 78dfc53..2edf577 100644 Binary files a/drawables/MusicApp/Screenshots/1.jpg and b/drawables/MusicApp/Screenshots/1.jpg differ diff --git a/drawables/MusicApp/Screenshots/2.jpg b/drawables/MusicApp/Screenshots/2.jpg index 44476c9..9aedc1d 100644 Binary files a/drawables/MusicApp/Screenshots/2.jpg and b/drawables/MusicApp/Screenshots/2.jpg differ diff --git a/drawables/MusicApp/Screenshots/3.jpg b/drawables/MusicApp/Screenshots/3.jpg index 2edf577..06e623b 100644 Binary files a/drawables/MusicApp/Screenshots/3.jpg and b/drawables/MusicApp/Screenshots/3.jpg differ diff --git a/drawables/MusicApp/Screenshots/4.jpg b/drawables/MusicApp/Screenshots/4.jpg index 9aedc1d..b3ae7fe 100644 Binary files a/drawables/MusicApp/Screenshots/4.jpg and b/drawables/MusicApp/Screenshots/4.jpg differ diff --git a/drawables/MusicApp/Screenshots/5.jpg b/drawables/MusicApp/Screenshots/5.jpg index 06e623b..1a2e714 100644 Binary files a/drawables/MusicApp/Screenshots/5.jpg and b/drawables/MusicApp/Screenshots/5.jpg differ diff --git a/drawables/MusicApp/Screenshots/6.jpg b/drawables/MusicApp/Screenshots/6.jpg index b3ae7fe..0a3f73c 100644 Binary files a/drawables/MusicApp/Screenshots/6.jpg and b/drawables/MusicApp/Screenshots/6.jpg differ diff --git a/drawables/MusicApp/Screenshots/7.jpg b/drawables/MusicApp/Screenshots/7.jpg index 1a2e714..9a6b48c 100644 Binary files a/drawables/MusicApp/Screenshots/7.jpg and b/drawables/MusicApp/Screenshots/7.jpg differ diff --git a/drawables/MusicApp/Screenshots/8.jpg b/drawables/MusicApp/Screenshots/8.jpg index 0a3f73c..2a98c3f 100644 Binary files a/drawables/MusicApp/Screenshots/8.jpg and b/drawables/MusicApp/Screenshots/8.jpg differ diff --git a/drawables/MusicApp/Screenshots/9.jpg b/drawables/MusicApp/Screenshots/9.jpg index 9a6b48c..cd3a794 100644 Binary files a/drawables/MusicApp/Screenshots/9.jpg and b/drawables/MusicApp/Screenshots/9.jpg differ diff --git a/en/index.html b/en/index.html index 4393900..9f5c032 100644 --- a/en/index.html +++ b/en/index.html @@ -76,10 +76,12 @@
-
+

Screenshots

+ +
- + @@ -87,7 +89,7 @@ - +
diff --git a/js/horizontalScrolling.js b/js/horizontalScrolling.js index 1781689..7839e97 100644 --- a/js/horizontalScrolling.js +++ b/js/horizontalScrolling.js @@ -7,7 +7,7 @@ sliders.forEach((slider) => slider.addEventListener("mousedown", (eventArg) => { sliding = true; - startX = eventArg.pageX; + startX = eventArg.pageX + slider.scrollLeft; }); slider.addEventListener("mousemove", (eventArg) => @@ -15,7 +15,14 @@ sliders.forEach((slider) => if (sliding) { eventArg.preventDefault(); - slider.scrollLeft += (startX - eventArg.pageX) * $(window).width() / (2 * slider.scrollWidth); + slider.scrollLeft = startX - eventArg.pageX; + + if (slider.scrollLeft == 0) + document.getElementById("left-scroll").style.display = "none"; + else + document.getElementById("left-scroll").style.display = "inline-block"; + + } }); @@ -26,4 +33,26 @@ sliders.forEach((slider) => slider.addEventListener("mouseleave", () => { sliding = false; }); + + //Shouldn't do it here, but will say it's ok. + document.getElementById("left-scroll").onclick = function() + { + slider.scrollBy({ top: 0, left: -slider.offsetWidth * 0.66, behavior: "smooth" }); + document.getElementById("right-scroll").style.display = "inline-block"; + + if (slider.scrollLeft == 0) + document.getElementById("left-scroll").style.display = "none"; + } + + document.getElementById("right-scroll").onclick = function() + { + slider.scrollBy({ top: 0, left: slider.offsetWidth * 0.66, behavior: "smooth" }); + document.getElementById("left-scroll").style.display = "inline-block"; + + console.log("Offset: " + slider.scrollWidth); + console.log("Scroll: " + slider.scrollLeft); + + if (slider.scrollLeft == slider.scrollWidth) + document.getElementById("right-scroll").style.display = "none"; + } }); \ No newline at end of file