remove isScroller property in favour of "is IScroller"

haxeui · Mar 15, 2024 · e88d93b · e88d93b
1 parent 79b1a0d
commit e88d93b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/haxe/ui/backend/ComponentBase.hx b/haxe/ui/backend/ComponentBase.hx
@@ -1682,11 +1682,6 @@ class ComponentBase extends ComponentSurface implements IClonable<ComponentBase>
         return false;
     }
 
-    private var isScroller(get, null):Bool;
-    private function get_isScroller():Bool {
-        return false;
-    }
-
     private function handleFrameworkProperty(id:String, value:Any) {
 
     }

diff --git a/haxe/ui/components/NumberStepper.hx b/haxe/ui/components/NumberStepper.hx
@@ -9,6 +9,7 @@ import haxe.ui.core.Component;
 import haxe.ui.core.CompositeBuilder;
 import haxe.ui.core.ICompositeInteractiveComponent;
 import haxe.ui.core.InteractiveComponent;
+import haxe.ui.core.IScroller;
 import haxe.ui.events.ActionEvent;
 import haxe.ui.events.FocusEvent;
 import haxe.ui.events.MouseEvent;
@@ -305,7 +306,7 @@ private class Events extends haxe.ui.events.Events {
     private function isInScroller():Bool {
         var p = _stepper.parentComponent;
         while (p != null) {
-            if (p.isScroller) {
+            if ((p is IScroller)) {
                 var vscroll = p.findComponent("scrollview-vscroll", Component);
                 if (vscroll != null && vscroll.hidden == false) {
                     return true;

diff --git a/haxe/ui/components/OptionStepper.hx b/haxe/ui/components/OptionStepper.hx
@@ -10,6 +10,7 @@ import haxe.ui.core.CompositeBuilder;
 import haxe.ui.core.ICompositeInteractiveComponent;
 import haxe.ui.core.IDataComponent;
 import haxe.ui.core.InteractiveComponent;
+import haxe.ui.core.IScroller;
 import haxe.ui.data.DataSource;
 import haxe.ui.events.ActionEvent;
 import haxe.ui.events.FocusEvent;
@@ -307,7 +308,7 @@ private class Events extends haxe.ui.events.Events {
     private function isInScroller():Bool {
         var p = _stepper.parentComponent;
         while (p != null) {
-            if (p.isScroller) {
+            if ((p is IScroller)) {
                 var vscroll = p.findComponent("scrollview-vscroll", Component);
                 if (vscroll != null && vscroll.hidden == false) {
                     return true;

diff --git a/haxe/ui/containers/ScrollView.hx b/haxe/ui/containers/ScrollView.hx
@@ -79,10 +79,6 @@ class ScrollView extends InteractiveComponent implements IScroller {
             cast(_compositeBuilder, ScrollViewBuilder).updateScrollRect(); // TODO: or this
         }
     }
-
-    private override function get_isScroller():Bool {
-        return true;
-    }
 }
 
 //***********************************************************************************************************