From f86a4ca59f97897a6b17a342405c141b1b280227 Mon Sep 17 00:00:00 2001 From: shima11 Date: Mon, 18 Mar 2024 22:02:48 +0900 Subject: [PATCH] update --- Dev/Sources/SwiftUIDemo/DemoMaskingView.swift | 10 +++++-- .../ClassicImageEditViewController.swift | 8 +++--- .../Drawing/BlurryMaskingView.swift | 26 +++++++++++++++++-- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Dev/Sources/SwiftUIDemo/DemoMaskingView.swift b/Dev/Sources/SwiftUIDemo/DemoMaskingView.swift index a4b3a04a..0a9da370 100644 --- a/Dev/Sources/SwiftUIDemo/DemoMaskingView.swift +++ b/Dev/Sources/SwiftUIDemo/DemoMaskingView.swift @@ -1,4 +1,5 @@ import BrightroomEngine +import SwiftUISupport import BrightroomUI import SwiftUI @@ -14,8 +15,12 @@ struct DemoMaskingView: View { var body: some View { VStack { - SwiftUIBlurryMaskingView(editingStack: editingStack) - .blushSize(brushSize) + ZStack { + ViewHost(instantiated: ImagePreviewView(editingStack: editingStack)) + SwiftUIBlurryMaskingView(editingStack: editingStack) + .blushSize(brushSize) + .hideBackdropImageView(true) + } HStack { Button(action: { @@ -34,6 +39,7 @@ struct DemoMaskingView: View { Text("50") }) } + } } diff --git a/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift b/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift index 0318ecb0..6ee48666 100644 --- a/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift +++ b/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift @@ -349,7 +349,7 @@ public final class ClassicImageEditViewController: UIViewController { previewView.isHidden = true maskingView.isHidden = true - maskingView.isblurryImageViewHidden = true + maskingView.isBlurryImageViewHidden = true maskingView.isUserInteractionEnabled = false @@ -361,7 +361,7 @@ public final class ClassicImageEditViewController: UIViewController { cropView.isHidden = true previewView.isHidden = false maskingView.isHidden = false - maskingView.isblurryImageViewHidden = false + maskingView.isBlurryImageViewHidden = false maskingView.isUserInteractionEnabled = true @@ -373,7 +373,7 @@ public final class ClassicImageEditViewController: UIViewController { cropView.isHidden = true previewView.isHidden = false maskingView.isHidden = true - maskingView.isblurryImageViewHidden = true + maskingView.isBlurryImageViewHidden = true maskingView.isUserInteractionEnabled = false @@ -386,7 +386,7 @@ public final class ClassicImageEditViewController: UIViewController { previewView.isHidden = false cropView.isHidden = true maskingView.isHidden = false - maskingView.isblurryImageViewHidden = false + maskingView.isBlurryImageViewHidden = false maskingView.isUserInteractionEnabled = false } diff --git a/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift b/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift index 3429a7e2..1598be7a 100644 --- a/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift +++ b/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift @@ -74,7 +74,7 @@ public final class BlurryMaskingView: PixelEditorCodeBasedView, UIScrollViewDele } } - public var isblurryImageViewHidden: Bool { + public var isBlurryImageViewHidden: Bool { get { blurryImageView.isHidden } @@ -285,6 +285,9 @@ public struct SwiftUIBlurryMaskingView: UIViewControllerRepresentable { private var _brushSize: CanvasView.BrushSize? + private var _isBackdropImageViewHidden: Bool? + private var _isBlurryImageViewHidden: Bool? + public init( editingStack: EditingStack ) { @@ -305,14 +308,33 @@ public struct SwiftUIBlurryMaskingView: UIViewControllerRepresentable { if let _brushSize { uiViewController.bodyView.setBrushSize(_brushSize) } + if let _isBackdropImageViewHidden { + uiViewController.bodyView.isBackdropImageViewHidden = _isBackdropImageViewHidden + } + if let _isBlurryImageViewHidden { + uiViewController.bodyView.isBlurryImageViewHidden = _isBlurryImageViewHidden + } } - public func blushSize(_ brushSize: CanvasView.BrushSize?) -> Self { + public func blushSize(_ brushSize: CanvasView.BrushSize) -> Self { var modified = self modified._brushSize = brushSize return modified } + public func hideBackdropImageView(_ isBackdropImageViewHidden: Bool) -> Self { + + var modified = self + modified._isBackdropImageViewHidden = isBackdropImageViewHidden + return modified + } + + public func hideBlurryImageView(_ isBlurryImageViewHidden: Bool) -> Self { + + var modified = self + modified._isBlurryImageViewHidden = isBlurryImageViewHidden + return modified + } }