Skip to content

R
renderingEngine
Commit 7127aca9 authored by rockyl's avatar rockyl
Browse files
Options

修复遮罩嵌套问题 

修改滚动方向
parent 864665b3
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
debug/engine.js
View file @ 7127aca9
...@@ -11107,12 +11107,13 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate: ...@@ -11107,12 +11107,13 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
s.direction = exports.SCROLL_DIRECTION.VERTICAL; s.direction = exports.SCROLL_DIRECTION.VERTICAL;
s.addEventListener(Event.ADDED_TO_STAGE, function (e) { s.addEventListener(Event.ADDED_TO_STAGE, function (e) {
s.stage.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s); s.stage.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s);
s.stage.addEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
}); });
s.addEventListener(Event.REMOVED_FROM_STAGE, function (e) { s.addEventListener(Event.REMOVED_FROM_STAGE, function (e) {
s.stage.removeEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s); s.stage.removeEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s);
s.stage.removeEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
}); });
s.addEventListener(MouseEvent.MOUSE_DOWN, s.onMouseEvent, s); s.addEventListener(MouseEvent.MOUSE_DOWN, s.onMouseEvent, s);
s.addEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
s.addEventListener(Event.ENTER_FRAME, function () { s.addEventListener(Event.ENTER_FRAME, function () {
var view = s.viewPort; var view = s.viewPort;
if (s.autoScroll) if (s.autoScroll)
......
debug/engine.js.map
View file @ 7127aca9
This source diff could not be displayed because it is too large. You can view the blob instead.
src/2d/ui/ScrollContainer.ts
View file @ 7127aca9
...@@ -180,12 +180,13 @@ export class ScrollContainer extends Container { ...@@ -180,12 +180,13 @@ export class ScrollContainer extends Container {
s.direction = SCROLL_DIRECTION.VERTICAL; s.direction = SCROLL_DIRECTION.VERTICAL;
s.addEventListener(Event.ADDED_TO_STAGE, function (e: Event) { s.addEventListener(Event.ADDED_TO_STAGE, function (e: Event) {
s.stage.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s); s.stage.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s);
s.stage.addEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
}); });
s.addEventListener(Event.REMOVED_FROM_STAGE, function (e: Event) { s.addEventListener(Event.REMOVED_FROM_STAGE, function (e: Event) {
s.stage.removeEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s); s.stage.removeEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s);
s.stage.removeEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
}); });
s.addEventListener(MouseEvent.MOUSE_DOWN, s.onMouseEvent, s); s.addEventListener(MouseEvent.MOUSE_DOWN, s.onMouseEvent, s);
s.addEventListener(MouseEvent.MOUSE_MOVE, s.onMouseEvent, s);
// s.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s); // s.addEventListener(MouseEvent.MOUSE_UP, s.onMouseEvent, s);
// s.addEventListener(MouseEvent.MOUSE_OUT, s.onMouseEvent, s); // s.addEventListener(MouseEvent.MOUSE_OUT, s.onMouseEvent, s);
s.addEventListener(Event.ENTER_FRAME, function () { s.addEventListener(Event.ENTER_FRAME, function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment