diff --git a/frontend/src/AppContent.vue b/frontend/src/AppContent.vue index 6089e26..2e7be72 100644 --- a/frontend/src/AppContent.vue +++ b/frontend/src/AppContent.vue @@ -13,7 +13,7 @@ import ContentLogPane from './components/content/ContentLogPane.vue' import ContentValueTab from '@/components/content/ContentValueTab.vue' import ToolbarControlWidget from '@/components/common/ToolbarControlWidget.vue' import { EventsOn, WindowIsFullscreen, WindowIsMaximised, WindowToggleMaximise } from 'wailsjs/runtime/runtime.js' -import { isMacOS } from '@/utils/platform.js' +import { isMacOS, isWindows } from '@/utils/platform.js' import iconUrl from '@/assets/images/icon.png' import ResizeableWrapper from '@/components/common/ResizeableWrapper.vue' import { extraTheme } from '@/utils/extra_theme.js' @@ -57,6 +57,9 @@ const logoPaddingLeft = ref(10) const maximised = ref(false) const hideRadius = ref(false) const wrapperStyle = computed(() => { + if (isWindows()) { + return {} + } return hideRadius.value ? {} : { @@ -65,6 +68,11 @@ const wrapperStyle = computed(() => { } }) const spinStyle = computed(() => { + if (isWindows()) { + return { + backgroundColor: themeVars.value.bodyColor, + } + } return hideRadius.value ? { backgroundColor: themeVars.value.bodyColor, diff --git a/frontend/src/utils/platform.js b/frontend/src/utils/platform.js index 20d315a..f17f359 100644 --- a/frontend/src/utils/platform.js +++ b/frontend/src/utils/platform.js @@ -10,3 +10,7 @@ export async function loadEnvironment() { export function isMacOS() { return os === 'darwin' } + +export function isWindows() { + return os === 'windows' +} diff --git a/main.go b/main.go index 851049e..158da48 100644 --- a/main.go +++ b/main.go @@ -114,7 +114,7 @@ func main() { Windows: &windows.Options{ WebviewIsTransparent: true, WindowIsTranslucent: true, - DisableFramelessWindowDecorations: true, + DisableFramelessWindowDecorations: false, }, Linux: &linux.Options{ ProgramName: "Tiny RDM",