mlm/adwaita-swift
1
0
Fork 0
forked from aparoksha/adwaita-swift
Code Pull Requests Activity

Add support for multiple dialogs on one view

Browse Source
This commit is contained in:
david-swift 2024-03-21 13:58:53 +01:00
parent d32aaa9de7
commit 2cb3c9552c
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Sources/Adwaita/View/Dialogs/Dialog.swift
View File

@ -12,6 +12,8 @@ struct Dialog: Widget {
/// Whether the dialog is visible. /// Whether the dialog is visible.
@Binding var visible: Bool @Binding var visible: Bool
/// An identifier used if multiple dialogs are on one view.
var id: String
/// The dialog's title. /// The dialog's title.
var title: String? var title: String?
/// The wrapped view. /// The wrapped view.
@ -44,7 +46,7 @@ struct Dialog: Widget {
/// - updateProperties: Whether to update properties. /// - updateProperties: Whether to update properties.
func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) { func update(_ storage: ViewStorage, modifiers: [(View) -> View], updateProperties: Bool) {
child.widget(modifiers: modifiers).update(storage, modifiers: modifiers, updateProperties: updateProperties) child.widget(modifiers: modifiers).update(storage, modifiers: modifiers, updateProperties: updateProperties)
if let storage = storage.content[contentID]?.first as? ViewStorage { if let storage = storage.content[contentID + id]?.first as? ViewStorage {
content content
.widget(modifiers: modifiers) .widget(modifiers: modifiers)
.update(storage, modifiers: modifiers, updateProperties: updateProperties) .update(storage, modifiers: modifiers, updateProperties: updateProperties)
@ -53,17 +55,17 @@ struct Dialog: Widget {
return return
} }
if visible { if visible {
if storage.content[dialogID]?.first == nil { if storage.content[dialogID + id]?.first == nil {
createDialog(storage: storage, modifiers: modifiers) createDialog(storage: storage, modifiers: modifiers)
adw_dialog_present(storage.content[dialogID]?.first?.pointer?.cast(), storage.pointer?.cast()) adw_dialog_present(storage.content[dialogID + id]?.first?.pointer?.cast(), storage.pointer?.cast())
} }
let pointer = storage.content[dialogID]?.first?.pointer let pointer = storage.content[dialogID + id]?.first?.pointer
adw_dialog_set_title(pointer?.cast(), title ?? "") adw_dialog_set_title(pointer?.cast(), title ?? "")
adw_dialog_set_content_width(pointer?.cast(), width?.cInt ?? -1) adw_dialog_set_content_width(pointer?.cast(), width?.cInt ?? -1)
adw_dialog_set_content_height(pointer?.cast(), height?.cInt ?? -1) adw_dialog_set_content_height(pointer?.cast(), height?.cInt ?? -1)
} else { } else {
if storage.content[dialogID]?.first != nil { if storage.content[dialogID + id]?.first != nil {
adw_dialog_close(storage.content[dialogID]?.first?.pointer?.cast()) adw_dialog_close(storage.content[dialogID + id]?.first?.pointer?.cast())
} }
} }
} }
@ -75,13 +77,13 @@ struct Dialog: Widget {
func createDialog(storage: ViewStorage, modifiers: [(View) -> View]) { func createDialog(storage: ViewStorage, modifiers: [(View) -> View]) {
let pointer = adw_dialog_new() let pointer = adw_dialog_new()
let dialog = ViewStorage(pointer?.opaque()) let dialog = ViewStorage(pointer?.opaque())
storage.content[dialogID] = [dialog] storage.content[dialogID + id] = [dialog]
let contentStorage = content.widget(modifiers: modifiers).storage(modifiers: modifiers) let contentStorage = content.widget(modifiers: modifiers).storage(modifiers: modifiers)
adw_dialog_set_child(pointer, contentStorage.pointer?.cast()) adw_dialog_set_child(pointer, contentStorage.pointer?.cast())
storage.content[contentID] = [contentStorage] storage.content[contentID + id] = [contentStorage]
dialog.connectSignal(name: "closed") { dialog.connectSignal(name: "closed") {
storage.content[dialogID] = [] storage.content[dialogID + id] = []
storage.content[contentID] = [] storage.content[contentID + id] = []
if visible { if visible {
visible = false visible = false
} }
@ -102,11 +104,20 @@ extension View {
public func dialog( public func dialog(
visible: Binding<Bool>, visible: Binding<Bool>,
title: String? = nil, title: String? = nil,
id: String? = nil,
width: Int? = nil, width: Int? = nil,
height: Int? = nil, height: Int? = nil,
@ViewBuilder content: () -> Body @ViewBuilder content: () -> Body
) -> View { ) -> View {
Dialog(visible: visible, title: title, child: self, content: content(), width: width, height: height) Dialog(
visible: visible,
id: id ?? "",
title: title,
child: self,
content: content(),
width: width,
height: height
)
} }
} }