From 09b28a1960feca3a6ccb68a0deab64f17616eb54 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 29 Jun 2022 22:22:00 -0700 Subject: [PATCH] fix webPreferencesPopoverView for macos --- .../Views/WebReader/WebReaderContainer.swift | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 54019c938..b18653424 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -139,6 +139,17 @@ struct WebReaderContainerView: View { } } + var webPreferencesPopoverView: some View { + WebPreferencesPopoverView( + updateFontFamilyAction: { updateFontFamilyActionID = UUID() }, + updateFontAction: { updateFontActionID = UUID() }, + updateTextContrastAction: { updateTextContrastActionID = UUID() }, + updateMaxWidthAction: { updateMaxWidthActionID = UUID() }, + updateLineHeightAction: { updateLineHeightActionID = UUID() }, + dismissAction: { showPreferencesPopover = false } + ) + } + var body: some View { ZStack { if let articleContent = viewModel.articleContent { @@ -210,16 +221,13 @@ struct WebReaderContainerView: View { } } #if os(iOS) - // TODO: implement for mac .formSheet(isPresented: $showPreferencesPopover, useSmallDetent: false) { - WebPreferencesPopoverView( - updateFontFamilyAction: { updateFontFamilyActionID = UUID() }, - updateFontAction: { updateFontActionID = UUID() }, - updateTextContrastAction: { updateTextContrastActionID = UUID() }, - updateMaxWidthAction: { updateMaxWidthActionID = UUID() }, - updateLineHeightAction: { updateLineHeightActionID = UUID() }, - dismissAction: { showPreferencesPopover = false } - ) + webPreferencesPopoverView + } + #else + .sheet(isPresented: $showPreferencesPopover) { + webPreferencesPopoverView + .frame(minWidth: 400, minHeight: 400) } #endif .onDisappear {