lyb-pixi-js 1.12.14 → 1.12.15

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -7,6 +7,8 @@ export interface LibPixiScrollContainerYParams {
     height: number;
     /** 滚动内容 */
     scrollContent: Container;
+    /** 顶部边距 */
+    topMargin?: number;
     /** 底部边距 */
     bottomMargin?: number;
     /** 背景色，用于定位 */

package/Components/Custom/LibPixiScrollContainerY.js

@@ -8,7 +8,7 @@ import { LibPixiRectangle } from "../Base/LibPixiRectangle";
  */
 export class LibPixiScrollContainerY extends LibPixiContainer {
     constructor(params) {
-        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, bottomMargin = 0, } = params;
+        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, topMargin = 0, bottomMargin = 0, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startY = 0;
@@ -36,10 +36,24 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._content = new Container();
         this.addChild(this._content);
         this._content.addChild(this._scrollContent);
-        //创建底部边距
-        const bottomMarginBox = new Sprite();
-        this._content.addChild(bottomMarginBox);
-        bottomMarginBox.height = this._content.height + bottomMargin;
+        if (topMargin) {
+            //创建底部边距
+            const topMarginBox = new Sprite();
+            this._content.addChild(topMarginBox);
+            topMarginBox.height = topMargin;
+            requestAnimationFrame(() => {
+                this._scrollContent.y += topMargin;
+            });
+        }
+        if (bottomMargin) {
+            //创建底部边距
+            const bottomMarginBox = new Sprite();
+            this._content.addChild(bottomMarginBox);
+            bottomMarginBox.height = bottomMargin;
+            requestAnimationFrame(() => {
+                bottomMarginBox.y = topMargin + this._scrollContent.height;
+            });
+        }
         // 创建遮罩
         this._maskGraphics = new LibPixiRectangle(width, height, "#000");
         this.addChild(this._maskGraphics);

package/lyb-pixi.js

@@ -49360,6 +49360,7 @@ void main(void)\r
         scrollbarColor = "#ffffff",
         onScroll,
         bgColor,
+        topMargin = 0,
         bottomMargin = 0
       } = params;
       super(width, height, bgColor);
@@ -49380,9 +49381,22 @@ void main(void)\r
       this._content = new Container();
       this.addChild(this._content);
       this._content.addChild(this._scrollContent);
-      const bottomMarginBox = new Sprite();
-      this._content.addChild(bottomMarginBox);
-      bottomMarginBox.height = this._content.height + bottomMargin;
+      if (topMargin) {
+        const topMarginBox = new Sprite();
+        this._content.addChild(topMarginBox);
+        topMarginBox.height = topMargin;
+        requestAnimationFrame(() => {
+          this._scrollContent.y += topMargin;
+        });
+      }
+      if (bottomMargin) {
+        const bottomMarginBox = new Sprite();
+        this._content.addChild(bottomMarginBox);
+        bottomMarginBox.height = bottomMargin;
+        requestAnimationFrame(() => {
+          bottomMarginBox.y = topMargin + this._scrollContent.height;
+        });
+      }
       this._maskGraphics = new LibPixiRectangle(width, height, "#000");
       this.addChild(this._maskGraphics);
       this.mask = this._maskGraphics;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.12.14",
+  "version": "1.12.15",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {