@galacean/effects-core 2.10.0-alpha.3 → 2.10.0-alpha.4

package/dist/gui/control.d.ts

@@ -2,8 +2,8 @@ import type { Color } from '@galacean/effects-math/es/core';
 import { Matrix3 } from '@galacean/effects-math/es/core/matrix3';
 import { Vector2 } from '@galacean/effects-math/es/core/vector2';
 import type { Engine } from '../engine';
-import type { InputEventKey, InputEventMouseButton, InputEventMouseMotion, InputEventScreenDrag, InputEventScreenTouch, MouseButton } from '../input';
-import { CursorShape, FocusBehaviorRecursive, FocusMode, MouseBehaviorRecursive, MouseFilter } from '../input';
+import type { CursorStyle, InputEventKey, InputEventMouseButton, InputEventMouseMotion, InputEventScreenDrag, InputEventScreenTouch } from '../input';
+import { FocusBehaviorRecursive, FocusMode, MouseBehaviorRecursive, MouseFilter } from '../input';
 import type { EventEmitterListener, EventEmitterOptions } from '../events';
 import type { FontStyle, FontWeight, TextureRegion } from '../render';
 import type { Texture } from '../texture';
@@ -72,8 +72,8 @@ export declare class Control {
     set focusMode(value: FocusMode);
     get focusBehaviorRecursive(): FocusBehaviorRecursive;
     set focusBehaviorRecursive(value: FocusBehaviorRecursive);
-    get defaultCursorShape(): CursorShape;
-    set defaultCursorShape(value: CursorShape);
+    get defaultCursorShape(): CursorStyle;
+    set defaultCursorShape(value: CursorStyle);
     get location(): Vector2;
     set location(value: Vector2);
     get rotation(): number;
@@ -108,8 +108,7 @@ export declare class Control {
     hasPoint(point: Vector2): boolean;
     getEffectiveMouseFilter(): MouseFilter;
     getFocusModeWithOverride(): FocusMode;
-    getCursorShape(position: Vector2): CursorShape;
-    acceptEvent(): void;
+    getCursorShape(position: Vector2): CursorStyle;
     focus(): void;
     grabFocus(): void;
     grabClickFocus(): void;
@@ -134,14 +133,14 @@ export declare class Control {
     drawTexture(x: number, y: number, width: number, height: number, texture: Texture, region?: TextureRegion, color?: Color): void;
     drawText(x: number, y: number, text: string, fontSize: number, color?: Color, fontFamily?: string, fontWeight?: FontWeight, fontStyle?: FontStyle): void;
     onMouseEnter(location: Vector2): void;
-    onMouseMove(location: Vector2, event: InputEventMouseMotion): void;
+    onMouseMove(event: InputEventMouseMotion): void;
     onMouseLeave(): void;
-    onMouseWheel(location: Vector2, delta: number, event: InputEventMouseButton): void;
-    onMouseDown(location: Vector2, button: MouseButton, event: InputEventMouseButton): void;
-    onMouseUp(location: Vector2, button: MouseButton, event: InputEventMouseButton): void;
-    onTouchDown(location: Vector2, pointerId: number, event: InputEventScreenTouch): void;
-    onTouchMove(location: Vector2, pointerId: number, event: InputEventScreenDrag): void;
-    onTouchUp(location: Vector2, pointerId: number, event: InputEventScreenTouch): void;
+    onMouseWheel(event: InputEventMouseButton): void;
+    onMouseDown(event: InputEventMouseButton): void;
+    onMouseUp(event: InputEventMouseButton): void;
+    onTouchDown(event: InputEventScreenTouch): void;
+    onTouchMove(event: InputEventScreenDrag): void;
+    onTouchUp(event: InputEventScreenTouch): void;
     onKeyDown(event: InputEventKey): void;
     onKeyUp(event: InputEventKey): void;
     onGotFocus(): void;
@@ -178,11 +177,11 @@ export declare abstract class RootControl extends ContainerControl {
     abstract guiGetDragData(): unknown;
     abstract guiIsDragSuccessful(): boolean;
     abstract guiCancelDrag(): void;
-    abstract acceptControlEvent(control: Control): void;
     abstract grabControlFocus(control: Control): void;
     abstract grabControlClickFocus(control: Control): void;
     abstract releaseControlFocus(control?: Control): void;
     abstract warpControlMouse(position: Vector2): void;
+    abstract updateMouseCursorState(): void;
     abstract controlStateChanged(control: Control): void;
     abstract controlRemoved(control: Control): void;
     abstract controlTreeChanged(): void;

package/dist/gui/roots.d.ts

@@ -21,7 +21,7 @@ export declare class CanvasContainer extends ContainerControl {
 export declare class WindowRootControl extends RootControl {
     readonly canvases: CanvasContainer;
     dragThreshold: number;
-    private inputHandled;
+    private lastInput;
     private readonly gui;
     constructor(engine: Engine);
     pushInput(event: InputEvent): void;
@@ -33,11 +33,11 @@ export declare class WindowRootControl extends RootControl {
     guiGetDragData(): unknown;
     guiIsDragSuccessful(): boolean;
     guiCancelDrag(): void;
-    acceptControlEvent(control: Control): void;
     grabControlFocus(control: Control): void;
     grabControlClickFocus(control: Control): void;
     releaseControlFocus(control?: Control): void;
     warpControlMouse(position: Vector2): void;
+    updateMouseCursorState(): void;
     controlStateChanged(control: Control): void;
     controlRemoved(control: Control): void;
     controlTreeChanged(): void;