fix: update smooth scroll

teletha · Dec 14, 2023 · b3d583b · b3d583b
1 parent d50671b
commit b3d583b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/src/main/java/viewtify/Viewtify.java b/src/main/java/viewtify/Viewtify.java
@@ -36,6 +36,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import com.sun.javafx.application.PlatformImpl;
+
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.DoubleExpression;
@@ -70,9 +72,6 @@
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
-
-import com.sun.javafx.application.PlatformImpl;
-
 import kiss.Decoder;
 import kiss.Disposable;
 import kiss.Encoder;
@@ -420,6 +419,15 @@ public Viewtify design(Class<? extends DesignScheme> scheme) {
         return this;
     }
 
+    /**
+     * Get application metadata.
+     * 
+     * @return
+     */
+    public String icon() {
+        return icon;
+    }
+
     /**
      * Configure application icon.
      * 

diff --git a/src/main/java/viewtify/preference/PreferenceView.java b/src/main/java/viewtify/preference/PreferenceView.java
@@ -17,15 +17,14 @@
 import java.util.List;
 import java.util.Set;
 
+import org.controlsfx.glyphfont.FontAwesome;
+
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Labeled;
 import javafx.stage.FileChooser.ExtensionFilter;
-
-import org.controlsfx.glyphfont.FontAwesome;
-
 import kiss.I;
 import kiss.Variable;
 import psychopath.Directory;
@@ -126,7 +125,7 @@ interface style extends StyleDSL {
         };
 
         Style search = () -> {
-            display.maxWidth(220, px);
+            display.minWidth(180, px);
             margin.top(15, px).left(15, px).bottom(15, px);
         };
 

diff --git a/src/main/java/viewtify/ui/UIScrollPane.java b/src/main/java/viewtify/ui/UIScrollPane.java
@@ -19,7 +19,6 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import javafx.util.Duration;
-
 import viewtify.ui.anime.Anime;
 import viewtify.ui.anime.Interpolators;
 import viewtify.ui.anime.SwapAnime;
@@ -169,7 +168,7 @@ private static class SmoothScrollPane extends ScrollPane {
         private SmoothScrollPane() {
             VBox inner = new VBox();
             inner.setOnScroll(e -> {
-                transition = new SmoothTransition(transition, e.getDeltaY(), getContent().getBoundsInLocal().getWidth(), getVvalue());
+                transition = new SmoothTransition(transition, e.getDeltaY(), getContent().getBoundsInLocal().getHeight() / 3, getVvalue());
                 transition.play();
             });
 
@@ -203,7 +202,7 @@ private SmoothTransition(SmoothTransition old, double deltaY, double width, doub
                 // then increment the modifer. This will boost the distance, thus looking faster
                 // and seemingly consecutive.
                 if (old != null && old.getStatus() == Status.RUNNING && 0 < deltaY * old.deltaY) {
-                    modifier = old.modifier + 1;
+                    modifier = old.modifier + 1.3;
                 } else {
                     modifier = 1;
                 }

diff --git a/src/main/java/viewtify/update/Update.java b/src/main/java/viewtify/update/Update.java
@@ -12,11 +12,6 @@
 import java.util.List;
 
 import javafx.geometry.Rectangle2D;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
-import javafx.stage.Window;
-
-import kiss.I;
 import psychopath.Directory;
 import psychopath.File;
 import psychopath.Locator;
@@ -117,16 +112,8 @@ public static void apply(String archive, boolean forcibly) {
                     Rectangle2D bounds = ScreenSelector.Application.select();
                     AppearanceSetting appearance = Preferences.of(AppearanceSetting.class);
 
-                    String icon = I.signal(Window.getWindows())
-                            .as(Stage.class)
-                            .flatIterable(Stage::getIcons)
-                            .map(Image::getUrl)
-                            .first()
-                            .to()
-                            .or("");
-
                     origin.updater()
-                            .env("Icon", icon)
+                            .env("Icon", Viewtify.application().icon())
                             .env("Theme", appearance.theme.v.name())
                             .env("ThemeType", appearance.themeType.v.name())
                             .env("Font", appearance.font.v)