ScrollMode.DEFAULT

haxeui · May 29, 2024 · b8bb3ff · b8bb3ff
1 parent 97f5e75
commit b8bb3ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/haxe/ui/constants/ScrollMode.hx b/haxe/ui/constants/ScrollMode.hx
@@ -3,6 +3,7 @@ package haxe.ui.constants;
 import haxe.ui.util.Variant;
 
 enum abstract ScrollMode(String) to String {
+	var DEFAULT = "default";
 	var NORMAL = "normal";
 	var DRAG = "drag";
 	var INERTIAL = "inertial";
@@ -11,6 +12,7 @@ enum abstract ScrollMode(String) to String {
 
 	@:from public static function fromString(s:String):ScrollMode {
 		return switch (s.toLowerCase()) {
+			case "default":     DEFAULT;
 			case "normal":      NORMAL;
 			case "drag":        DRAG;
 			case "inertial":    INERTIAL;

diff --git a/haxe/ui/containers/ScrollView.hx b/haxe/ui/containers/ScrollView.hx
@@ -52,7 +52,7 @@ class ScrollView extends InteractiveComponent implements IScroller {
     @:clonable @:behaviour(VScrollThumbSize)                        public var vscrollThumbSize:Null<Float>;
     @:clonable @:behaviour(ThumbSize)                               public var thumbSize:Null<Float>;
     @:clonable @:behaviour(DefaultBehaviour, MouseButton.LEFT)      public var scrollMouseButton:MouseButton;
-    @:clonable @:behaviour(ScrollModeBehaviour, ScrollMode.DRAG)    public var scrollMode:ScrollMode;
+    @:clonable @:behaviour(ScrollModeBehaviour, ScrollMode.DEFAULT) public var scrollMode:ScrollMode;
     @:clonable @:behaviour(ScrollPolicyBehaviour)                   public var scrollPolicy:ScrollPolicy;
     @:clonable @:behaviour(HScrollPolicyBehaviour)                  public var horizontalScrollPolicy:ScrollPolicy;
     @:clonable @:behaviour(VScrollPolicyBehaviour)                  public var verticalScrollPolicy:ScrollPolicy;
@@ -762,7 +762,7 @@ class ScrollViewEvents extends haxe.ui.events.Events {
             vscroll.registerEvent(ScrollEvent.SCROLL, onVScrollScroll);
         }
 
-        if (_scrollview.scrollMode == ScrollMode.DRAG || _scrollview.scrollMode == ScrollMode.INERTIAL || _scrollview.isHybridScroller) {
+        if (_scrollview.scrollMode == ScrollMode.DEFAULT || _scrollview.scrollMode == ScrollMode.DRAG || _scrollview.scrollMode == ScrollMode.INERTIAL || _scrollview.isHybridScroller) {
             registerEvent(MouseEvent.MIDDLE_MOUSE_DOWN, onMiddleMouseDown);
             registerEvent(MouseEvent.MOUSE_DOWN, onLeftMouseDown);
             registerEvent(MouseEvent.RIGHT_MOUSE_DOWN, onRightMouseDown);

diff --git a/haxe/ui/core/IScroller.hx b/haxe/ui/core/IScroller.hx
@@ -1,5 +1,7 @@
 package haxe.ui.core;
 
+import haxe.ui.constants.ScrollMode;
+
 interface IScroller {
     public function ensureVisible(component:Component):Void;
     public function findHorizontalScrollbar():Component;
@@ -10,4 +12,5 @@ interface IScroller {
     public var vscrollPos(get, set):Float;
     public var hscrollPos(get, set):Float;
     public var virtual(get, set):Bool;
+    public var scrollMode(get, set):ScrollMode;
 }