lyb-pixi-js 1.11.28 → 1.11.29

package/Components/Custom/LibPixiScrollContainerY.d.ts

@@ -42,6 +42,10 @@ export declare class LibPixiScrollContainerY extends LibPixiContainer {
     private _scrollbarDragging;
     /** 滚动条拖动偏移量 */
     private _scrollbarDragOffset;
+    /** 滚动条右边距 */
+    private _scrollbarRgiht;
+    /** 滚动条宽度 */
+    private _scrollbarWidth;
     /** 滚动容器 */
     _scrollContent: Container;
     /** 遮罩 */

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, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, bottomMargin = 0, } = params;
+        const { width, height, scrollbar = false, scrollContent, scrollbarRgiht = 0, scrollbarWidth = 10, scrollbarColor = "#ffffff", onScroll, bgColor, bottomMargin = 0, } = params;
         super(width, height, bgColor);
         /** 开始位置 */
         this._startY = 0;
@@ -26,6 +26,8 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._scrollbarDragging = false;
         /** 滚动条拖动偏移量 */
         this._scrollbarDragOffset = 0;
+        this._scrollbarRgiht = scrollbarRgiht;
+        this._scrollbarWidth = scrollbarWidth;
         this._scrollContent = scrollContent;
         this._scrollbarColor = scrollbarColor;
         this._onScroll = onScroll;
@@ -96,7 +98,7 @@ export class LibPixiScrollContainerY extends LibPixiContainer {
         this._maskGraphics.drawRect(0, 0, width, height);
         this._maskGraphics.endFill();
         this.setSize(width, height);
-        this._scrollbar.x = width - 50;
+        this._scrollbar.x = width - (this._scrollbarRgiht || this._scrollbarWidth);
     }
     /** @description 返回顶部 */
     scrollToTop() {

package/lyb-pixi.js

@@ -1907,15 +1907,7 @@
   };
   var implementation = implementation$1;
   var functionBind = Function.prototype.bind || implementation;
-  var functionCall;
-  var hasRequiredFunctionCall;
-  function requireFunctionCall() {
-    if (hasRequiredFunctionCall)
-      return functionCall;
-    hasRequiredFunctionCall = 1;
-    functionCall = Function.prototype.call;
-    return functionCall;
-  }
+  var functionCall = Function.prototype.call;
   var functionApply;
   var hasRequiredFunctionApply;
   function requireFunctionApply() {
@@ -1928,12 +1920,12 @@
   var reflectApply = typeof Reflect !== "undefined" && Reflect && Reflect.apply;
   var bind$2 = functionBind;
   var $apply$1 = requireFunctionApply();
-  var $call$2 = requireFunctionCall();
+  var $call$2 = functionCall;
   var $reflectApply = reflectApply;
   var actualApply = $reflectApply || bind$2.call($call$2, $apply$1);
   var bind$1 = functionBind;
   var $TypeError$4 = type;
-  var $call$1 = requireFunctionCall();
+  var $call$1 = functionCall;
   var $actualApply = actualApply;
   var callBindApplyHelpers = function callBindBasic2(args) {
     if (args.length < 1 || typeof args[0] !== "function") {
@@ -2051,7 +2043,7 @@
   var $ObjectGPO = requireObject_getPrototypeOf();
   var $ReflectGPO = requireReflect_getPrototypeOf();
   var $apply = requireFunctionApply();
-  var $call = requireFunctionCall();
+  var $call = functionCall;
   var needsEval = {};
   var TypedArray = typeof Uint8Array === "undefined" || !getProto ? undefined$1 : getProto(Uint8Array);
   var INTRINSICS = {
@@ -49292,7 +49284,7 @@ void main(void)\r
         height,
         scrollbar = false,
         scrollContent,
-        scrollbarRgiht,
+        scrollbarRgiht = 0,
         scrollbarWidth = 10,
         scrollbarColor = "#ffffff",
         onScroll,
@@ -49308,6 +49300,8 @@ void main(void)\r
       this._isDragging = false;
       this._scrollbarDragging = false;
       this._scrollbarDragOffset = 0;
+      this._scrollbarRgiht = scrollbarRgiht;
+      this._scrollbarWidth = scrollbarWidth;
       this._scrollContent = scrollContent;
       this._scrollbarColor = scrollbarColor;
       this._onScroll = onScroll;
@@ -49379,7 +49373,7 @@ void main(void)\r
       this._maskGraphics.drawRect(0, 0, width, height);
       this._maskGraphics.endFill();
       this.setSize(width, height);
-      this._scrollbar.x = width - 50;
+      this._scrollbar.x = width - (this._scrollbarRgiht || this._scrollbarWidth);
     }
     /** @description 返回顶部 */
     scrollToTop() {

package/package.json

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