diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1120386..cef49b9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,22 +8,25 @@ # https://github.com/Ambre-io/sparkplugui # -name: sparkplugui +name: Linux on: push: - branches: [ "main" ] +# branches: [ "main" ] +# tags: ['v*'] pull_request: - branches: [ "main" ] +# branches: [ "main" ] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - uses: dAppServer/wails-build-action@v2.2 + - name: Build Linux SparkpluGUI + uses: dAppServer/wails-build-action@v2.2 with: build-name: SparkpluGUI build-platform: linux/amd64 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 08ca826..2af2207 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,22 +8,24 @@ # https://github.com/Ambre-io/sparkplugui # -name: sparkplugui +name: macOs on: push: - branches: [ "main" ] +# branches: [ "main" ] pull_request: - branches: [ "main" ] +# branches: [ "main" ] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - uses: dAppServer/wails-build-action@v2.2 + - name: Build macOs SparkpluGUI + uses: dAppServer/wails-build-action@v2.2 with: build-name: SparkpluGUI build-platform: darwin/amd64 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e6675c9..2e9aa0a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,22 +8,24 @@ # https://github.com/Ambre-io/sparkplugui # -name: sparkplugui +name: Windows on: push: - branches: [ "main" ] +# branches: [ "main" ] pull_request: - branches: [ "main" ] +# branches: [ "main" ] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - uses: dAppServer/wails-build-action@v2.2 + - name: Build Windows SparkpluGUI + uses: dAppServer/wails-build-action@v2.2 with: build-name: SparkpluGUI build-platform: windows/amd64 diff --git a/frontend/src/components/containers/Amain.tsx b/frontend/src/components/containers/Amain.tsx index 3b6c47b..6c64496 100644 --- a/frontend/src/components/containers/Amain.tsx +++ b/frontend/src/components/containers/Amain.tsx @@ -35,9 +35,9 @@ const defaultLayouts: Layouts = { lg: [ {i: constants.softCard, x: 0, y: 0, w: 3, h: 1, static: true}, {i: constants.formCard, x: 3, y: 0, w: 5, h: 1, minW: 3, minH: 1}, - {i: constants.treeCard, x: 0, y: 2, w: 4, h: 5, minW: 3, minH: 1}, - {i: constants.lastMessageCard, x: 4, y: 0, w: 4, h: 5, minW: 3, minH: 1}, - {i: constants.messagesCard, x: 8, y: 0, w: 4, h: 6, minW: 3, minH: 1} + {i: constants.treeCard, x: 0, y: 2, w: 4, h: 4, minW: 3, minH: 1}, + {i: constants.lastMessageCard, x: 4, y: 0, w: 4, h: 4, minW: 3, minH: 1}, + {i: constants.messagesCard, x: 8, y: 0, w: 4, h: 5, minW: 3, minH: 1} ], xl: [ {i: constants.softCard, x: 0, y: 0, w: 2, h: 1, static: true}, diff --git a/main.go b/main.go index 8a94006..376dd7d 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,7 @@ var popWindowWidth = 1500 var popWindowHeight = 970 var minWindowWidth = md + 1 -var minWindowHeight = 810 +var minWindowHeight = 830 var maxWindowWidth = 2560 var maxWindowHeight = 1440