aparoksha/adwaita-swift
3
7
Fork 5
Code Issues 19 Pull Requests Actions Releases 1 Activity

Move from has-focus to contains-focus for focused

Browse Source
This commit is contained in:
david-swift 2024-03-25 14:50:18 +01:00
parent 2cb3c9552c
commit a4ffbd4c63
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Sources/Adwaita/View/Modifiers/InspectorWrapper.swift
View File

@ -38,6 +38,9 @@ struct InspectorWrapper: Widget {
extension View { extension View {
/// The identifier for the focus event controller.
static var focus: String { "focus" }
/// Modify a GTUI widget before being displayed and when being updated. /// Modify a GTUI widget before being displayed and when being updated.
/// - Parameter modify: Modify the widget. /// - Parameter modify: Modify the widget.
/// - Returns: A view. /// - Returns: A view.
@ -142,14 +145,22 @@ extension View {
/// - Parameter focus: Whether the view is focused. /// - Parameter focus: Whether the view is focused.
/// - Returns: A view. /// - Returns: A view.
public func focused(_ focused: Binding<Bool>) -> View { public func focused(_ focused: Binding<Bool>) -> View {
inspect { storage in inspectOnAppear { storage in
storage.notify(name: "has-focus", id: "focused") { let controller = gtk_event_controller_focus_new()
let newValue = gtk_widget_has_focus(storage.pointer?.cast()) != 0 storage.content[Self.focus] = [.init(controller)]
gtk_widget_add_controller(storage.pointer?.cast(), controller)
}
.inspect { storage in
guard let controller = storage.content[Self.focus]?.first else {
return
}
controller.notify(name: "contains-focus", id: "focused") {
let newValue = gtk_event_controller_focus_contains_focus(controller.pointer) != 0
if focused.wrappedValue != newValue { if focused.wrappedValue != newValue {
focused.wrappedValue = newValue focused.wrappedValue = newValue
} }
} }
if focused.wrappedValue != (gtk_widget_has_focus(storage.pointer?.cast()) != 0) { if focused.wrappedValue != (gtk_event_controller_focus_contains_focus(controller.pointer) != 0) {
gtk_widget_grab_focus(storage.pointer?.cast()) gtk_widget_grab_focus(storage.pointer?.cast())
} }
} }