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 @@
@@ -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" > { - 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 ); }