修复 floaty.window悬浮窗位置不正确的问题

autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java

@@ -37,10 +37,12 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
 
     private VolatileDispose<RuntimeException> mInflateException = new VolatileDispose<>();
     private View mCloseButton;
+    private int mOffset;
 
 
     public BaseResizableFloatyWindow(Context context, ViewSupplier viewSupplier) {
         this(new MyFloaty(context, viewSupplier));
+        mOffset = context.getResources().getDimensionPixelSize(R.dimen.floaty_window_offset);
     }
 
     private BaseResizableFloatyWindow(MyFloaty floaty) {
@@ -51,6 +53,26 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
         return mInflateException.blockedGetOrThrow(ScriptInterruptedException.class);
     }
 
+    @Override
+    protected WindowBridge onCreateWindowBridge(WindowManager.LayoutParams params) {
+        return new WindowBridge.DefaultImpl(params, getWindowManager(), getWindowView()) {
+            @Override
+            public int getX() {
+                return super.getX() + mOffset;
+            }
+
+            @Override
+            public int getY() {
+                return super.getY() + mOffset;
+            }
+
+            @Override
+            public void updatePosition(int x, int y) {
+                super.updatePosition(x - mOffset, y - mOffset);
+            }
+        };
+    }
+
     @Override
     public void onCreate(FloatyService service, WindowManager manager) {
         try {
@@ -108,6 +130,7 @@ public class BaseResizableFloatyWindow extends ResizableFloatyWindow {
         private View mRootView;
         private Context mContext;
 
+
         public MyFloaty(Context context, ViewSupplier supplier) {
             mContentViewSupplier = supplier;
             mContext = context;

autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java

@@ -18,6 +18,7 @@ import com.stardust.autojs.util.FloatingPermission;
 import com.stardust.enhancedfloaty.FloatyService;
 import com.stardust.util.UiHandler;
 import com.stardust.util.ViewUtil;
+import com.stardust.util.ViewUtils;
 
 import java.util.concurrent.CopyOnWriteArraySet;
 

autojs/src/main/res/layout/floaty_window.xml

@@ -9,7 +9,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="12dp">
+        android:layout_margin="@dimen/floaty_window_offset">
 
     </FrameLayout>
 

autojs/src/main/res/values/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="floaty_window_offset">12dp</dimen>
+</resources>