From 56e3180c3231df41085ccbbbd5815d784c9eec80 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Tue, 27 Sep 2022 17:24:00 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=BD=91=E9=A1=B5=E9=80=82=E9=85=8DSpecialVi?=
 =?UTF-8?q?deo=E8=87=AA=E5=8A=A8=E9=93=BA=E6=BB=A1=E5=AE=AB=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pad/ContentWall.vue | 12 ++----------
 src/pages/WallPage.vue  | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue
index 11b61ae..3a7e6e7 100644
--- a/src/pad/ContentWall.vue
+++ b/src/pad/ContentWall.vue
@@ -32,8 +32,7 @@
           :y="
             $refs.wall?.parentElement?.offsetTop +
             $refs.wall_content?.offsetTop +
-            item.y * wall_content_client_height +
-            $store.state.wall_row / ($store.state.landspace ? 2 : 1)
+            item.y * wall_content_client_height
           "
           :zIndex="
             1 +
@@ -77,6 +76,7 @@
       </div>
       <div
         v-show="$store.state.power_state"
+        id="wall_grids"
         ref="wall_grids"
         @touchstart="$store.commit('setSelectedWindow', '')"
       >
@@ -579,15 +579,7 @@ export default defineComponent({
       rect.height = rect.height ?? 0;
       rect.left = rect.left ?? 0;
       rect.top = rect.top ?? 0;
-      // moveWindow(window_id, evt);
       if (wall.value) {
-        // GlobalData.getInstance()
-        //   .getCurrentClient()
-        //   ?.resizeWindow(
-        //     window_id,
-        //     evt.width / wall.value.clientWidth,
-        //     evt.height / wall.value.clientHeight
-        //   );
         const x =
           rect.left -
           (wall.value.parentElement?.offsetLeft ?? 0) -
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 0780763..24712d7 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -15,17 +15,17 @@
       v-if="$store.state.power_state && show_windows_flag"
     >
       <vue3-resize-drag
-        :w="item.width * ($refs.wall?.clientWidth ?? 0)"
-        :h="item.height * ($refs.wall?.clientHeight ?? 0)"
+        :w="item.width * ($refs.wall?.offsetWidth ?? 0)"
+        :h="item.height * ($refs.wall?.offsetHeight ?? 0)"
         :x="
           ($refs.wall?.parentElement?.offsetLeft ?? 0) +
           ($refs.wall?.offsetLeft ?? 0) +
-          item.x * ($refs.wall?.clientWidth ?? 0)
+          item.x * ($refs.wall?.offsetWidth ?? 0)
         "
         :y="
           ($refs.wall?.parentElement?.offsetTop ?? 0) +
           ($refs.wall?.offsetTop ?? 0) +
-          item.y * ($refs.wall?.clientHeight ?? 0)
+          item.y * ($refs.wall?.offsetHeight ?? 0)
         "
         :zIndex="
           $store.state.windows_sort.findIndex((element) => element == item.uuid)
@@ -68,6 +68,7 @@
       </vue3-resize-drag>
     </div>
     <div
+      id="wall_grids"
       ref="wall_grids"
       @click="onWallGridsClick"
       v-if="$store.state.power_state"
@@ -286,8 +287,9 @@ export default defineComponent({
     const item_height = ref(0);
 
     const calcWallItemWH = () => {
-      item_witdh.value =
-        wall?.value?.parentElement?.offsetWidth ?? 0 / wall_cols.value;
+      item_witdh.value = Math.floor(
+        (wall?.value?.parentElement?.offsetWidth ?? 0) / wall_cols.value
+      );
       if (wall.value && wall.value.parentElement) {
         if ($store.state.isSpecialVideo()) {
           const screen_info = SpecialVideoHelper.getScreenInfo(
@@ -319,9 +321,9 @@ export default defineComponent({
       }
 
       item_witdh.value =
-        Math.ceil(item_witdh.value + wall_cols.value) & ~wall_cols.value;
+        Math.ceil(item_witdh.value - wall_cols.value) & ~wall_cols.value;
       item_height.value =
-        Math.ceil(item_height.value + wall_rows.value) & ~wall_rows.value;
+        Math.ceil(item_height.value - wall_rows.value) & ~wall_rows.value;
     };
 
     const wallMouseDown = (evt: MouseEvent) => {
@@ -739,9 +741,9 @@ export default defineComponent({
           .getCurrentClient()
           ?.setWindowGeometry(
             window_id,
-            x / wall.value.clientWidth,
+            x / wall.value.offsetWidth,
             y / wall.value.clientHeight,
-            rect.width / wall.value.clientWidth,
+            rect.width / wall.value.offsetWidth,
             rect.height / wall.value.clientHeight
           );
       }