diff --git a/client/src/views/partials/game/IconButton.vue b/client/src/views/partials/game/IconButton.vue index 64c4ce5e..407325cc 100644 --- a/client/src/views/partials/game/IconButton.vue +++ b/client/src/views/partials/game/IconButton.vue @@ -43,6 +43,7 @@ let toggled = props.toggled; margin: 2px; transition: .3s background-color; + border: 1px solid var(--color-border); } .icon-button:hover { diff --git a/client/src/views/windows/MainMenuWindow.vue b/client/src/views/windows/MainMenuWindow.vue index 6410ed95..3e351857 100644 --- a/client/src/views/windows/MainMenuWindow.vue +++ b/client/src/views/windows/MainMenuWindow.vue @@ -25,9 +25,6 @@ let title = data.title; onMounted(() => { SetupHandle(id, handle); SetSize(id, {width: 500, height: 540}); - SetResizable(id, true); - SetMinSize(id, {width: 500, height: 540}); - SetMaxSize(id, {width: 700, height: 700}); ResetPosition(id, "center", emitter); }); diff --git a/client/src/views/windows/campaigns/CampaignPreviewWindow.vue b/client/src/views/windows/campaigns/CampaignPreviewWindow.vue index 8432792b..1e8da1b8 100644 --- a/client/src/views/windows/campaigns/CampaignPreviewWindow.vue +++ b/client/src/views/windows/campaigns/CampaignPreviewWindow.vue @@ -6,7 +6,7 @@ import WindowHandle from '@/views/partials/WindowHandle.vue'; import PlayerList from '../../partials/PlayerList.vue'; import { Disconnect, DisplayToast, GetCampaign, GetClient } from '../../../services/Dragonroll'; import CampaignBookList from '../../partials/books/CampaignBookList.vue'; -import { ClearAll, ClearWindow, CreateWindow } from '../../../services/Windows'; +import { ClearAll, ClearWindow, CreateWindow, SetMinSize, SetResizable } from '../../../services/Windows'; import { LaunchGame } from '../../../services/Game'; import { AddSound } from '../../../services/Sound'; import ChatComponent from '../../partials/ChatComponent.vue'; @@ -29,6 +29,9 @@ onMounted(() => { SetupHandle(id, handle); SetSize(id, {width: 800, height: 750}); + SetResizable(id, true); + SetMinSize(id, {width: 600, height: 500}); + hide_chat.value = true; ResetPosition(id, "center"); @@ -135,13 +138,8 @@ function Exit(){ .campaign-preview-container { width: 100%; height: 100%; - - display: grid; - grid-template-columns: 2fr 4fr 3fr; - - &.campaign-preview-compact { - grid-template-columns: 2fr 4fr; - } + display: flex; + flex-direction: row; } .campaign-preview-column { @@ -150,12 +148,17 @@ function Exit(){ &.left { background-color: var(--color-background-soft); + border-right: 1px solid var(--color-border); + flex-grow: 1; + min-width: 100px; + max-width: 300px; } &.center { background-color: var(--color-background-semisoft); display: flex; + flex-grow: 3; } &.right { diff --git a/client/src/views/windows/dm/MapButtons.vue b/client/src/views/windows/dm/MapButtons.vue index be7592f5..058545d2 100644 --- a/client/src/views/windows/dm/MapButtons.vue +++ b/client/src/views/windows/dm/MapButtons.vue @@ -4,7 +4,7 @@ import WindowHandle from '@/views/partials/WindowHandle.vue'; import { onMounted, onUpdated, ref } from 'vue'; import { SetupHandle, SetSize, SetPosition, ResetPosition } from '@/services/Windows'; import IconButton from '@/views/partials/game/IconButton.vue' -import { CreateChildWindow, GetPosition } from '../../../services/Windows'; +import { CreateChildWindow, GetPosition, SetMaxSize, SetMinSize, SetResizable } from '../../../services/Windows'; const props = defineProps(['data']); const data = props.data; @@ -15,12 +15,15 @@ let id = data.id; onMounted(() => { SetupHandle(id, handle); + SetResizable(id, true); SetSize(id, {width: 40, height: 200}); + SetMinSize(id, {width: 40, height: 200}); + SetMaxSize(id, {width: 40, height: 300}); + ResetPosition(id, {x: 10, y: 200}); }); - function EditEnvironment(){ let winPos = GetPosition(id); CreateChildWindow(id, 'environment', {x: winPos.x + 50, y: winPos.y}); diff --git a/client/src/views/windows/dm/MapWindow.vue b/client/src/views/windows/dm/MapWindow.vue index 656a20f1..83e5a71c 100644 --- a/client/src/views/windows/dm/MapWindow.vue +++ b/client/src/views/windows/dm/MapWindow.vue @@ -7,6 +7,7 @@ import { ImportDD2VTT } from '../../../services/Map'; import MapList from '../../partials/MapList.vue'; import IconButton from '@/views/partials/game/IconButton.vue'; +import { SetMinSize, SetResizable, SetMaxSize } from '../../../services/Windows'; const props = defineProps(['data']); const data = props.data; @@ -27,6 +28,9 @@ function NewMapButton(){ onMounted(() => { SetupHandle(id, handle); SetSize(id, {width: 300, height: 600}); + SetResizable(id, true); + SetMinSize(id, {width: 300, height: 300}); + SetMaxSize(id, {width: 300}); ResetPosition(id, {x: 100, y: 10}); mapUploader.value.addEventListener('change', (event) => { diff --git a/client/src/views/windows/game/CombatWindow.vue b/client/src/views/windows/game/CombatWindow.vue index 739171a9..fad3ac1e 100644 --- a/client/src/views/windows/game/CombatWindow.vue +++ b/client/src/views/windows/game/CombatWindow.vue @@ -3,6 +3,7 @@ import WindowHandle from '@/views/partials/WindowHandle.vue'; import { onMounted, onUpdated, ref, watch } from 'vue'; import { SetupHandle, SetSize, SetPosition, ResetPosition } from '@/services/Windows'; +import { SetMaxSize, SetMinSize, SetResizable } from '../../../services/Windows'; const props = defineProps(['data']); const data = props.data; @@ -14,6 +15,9 @@ let id = data.id; onMounted(() => { SetupHandle(id, handle); SetSize(id, {width: 200, height: 300}); + SetResizable(id, true); + SetMinSize(id, {width: 200, height: 200}); + SetMaxSize(id, {width: 200}); ResetPosition(id, {x: 30, y: 300}); });