From cb7402bc6952a1abdd64492fc5b8d247968571ba Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 24 Jul 2024 17:15:55 -0600 Subject: [PATCH] Ladybird: Reformat AppKit UI Swift files --- Ladybird/AppKit/UI/TaskManager.swift | 80 +++++++++---------- .../AppKit/UI/TaskManagerController.swift | 58 +++++++------- 2 files changed, 68 insertions(+), 70 deletions(-) diff --git a/Ladybird/AppKit/UI/TaskManager.swift b/Ladybird/AppKit/UI/TaskManager.swift index a2f737b8221..832fa5a3406 100644 --- a/Ladybird/AppKit/UI/TaskManager.swift +++ b/Ladybird/AppKit/UI/TaskManager.swift @@ -12,53 +12,51 @@ import SwiftUI public class TaskManager: NSWindow { - private let WINDOW_WIDTH: CGFloat = 600 - private let WINDOW_HEIGHT: CGFloat = 400 + private let WINDOW_WIDTH: CGFloat = 600 + private let WINDOW_HEIGHT: CGFloat = 400 - var web_view: LadybirdWebView - private var timer: Timer? + var web_view: LadybirdWebView + private var timer: Timer? - init() { - let tab_rect = NSApplication.shared.keyWindow!.frame - let position_x = tab_rect.origin.x + (tab_rect.size.width - WINDOW_WIDTH) / 2 - let position_y = tab_rect.origin.y + (tab_rect.size.height - WINDOW_HEIGHT) / 2 + init() { + let tab_rect = NSApplication.shared.keyWindow!.frame + let position_x = tab_rect.origin.x + (tab_rect.size.width - WINDOW_WIDTH) / 2 + let position_y = tab_rect.origin.y + (tab_rect.size.height - WINDOW_HEIGHT) / 2 - let window_rect = NSMakeRect(position_x, position_y, WINDOW_WIDTH, WINDOW_HEIGHT) - let style_mask = NSWindow.StyleMask.init(arrayLiteral: [ - NSWindow.StyleMask.titled, NSWindow.StyleMask.closable, NSWindow.StyleMask.miniaturizable, - NSWindow.StyleMask.resizable, - ]) + let window_rect = NSMakeRect(position_x, position_y, WINDOW_WIDTH, WINDOW_HEIGHT) + let style_mask = NSWindow.StyleMask.init(arrayLiteral: [ + NSWindow.StyleMask.titled, NSWindow.StyleMask.closable, NSWindow.StyleMask.miniaturizable, + NSWindow.StyleMask.resizable, + ]) - self.web_view = LadybirdWebView.init(nil) + self.web_view = LadybirdWebView.init(nil) - super.init( - contentRect: window_rect, styleMask: style_mask, backing: NSWindow.BackingStoreType.buffered, - defer: false) + super.init(contentRect: window_rect, styleMask: style_mask, backing: NSWindow.BackingStoreType.buffered, defer: false) - self.timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] timer in - if let strong_self = self { - strong_self.updateStatistics() - } + self.timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] timer in + if let strong_self = self { + strong_self.updateStatistics() + } + } + + self.web_view.postsBoundsChangedNotifications = true + let scroll_view = NSScrollView() + scroll_view.hasVerticalScroller = true + scroll_view.hasHorizontalScroller = true + scroll_view.lineScroll = 24 + + scroll_view.contentView = self.web_view + scroll_view.documentView = NSView() + + self.contentView = scroll_view + self.title = "Task Manager" + self.setIsVisible(true) + + self.updateStatistics() } - self.web_view.postsBoundsChangedNotifications = true - let scroll_view = NSScrollView() - scroll_view.hasVerticalScroller = true - scroll_view.hasHorizontalScroller = true - scroll_view.lineScroll = 24 - - scroll_view.contentView = self.web_view - scroll_view.documentView = NSView() - - self.contentView = scroll_view - self.title = "Task Manager" - self.setIsVisible(true) - - self.updateStatistics() - } - - func updateStatistics() { - WebView.Application.the().update_process_statistics(); - self.web_view.loadHTML(WebView.Application.the().generate_process_statistics_html().__bytes_as_string_viewUnsafe()); - } + func updateStatistics() { + WebView.Application.the().update_process_statistics() + self.web_view.loadHTML(WebView.Application.the().generate_process_statistics_html().__bytes_as_string_viewUnsafe()) + } } diff --git a/Ladybird/AppKit/UI/TaskManagerController.swift b/Ladybird/AppKit/UI/TaskManagerController.swift index e5f00cad590..67ac5149175 100644 --- a/Ladybird/AppKit/UI/TaskManagerController.swift +++ b/Ladybird/AppKit/UI/TaskManagerController.swift @@ -10,41 +10,41 @@ import SwiftUI @objc public protocol TaskManagerDelegate where Self: NSObject { - func onTaskManagerClosed() + func onTaskManagerClosed() } public class TaskManagerController: NSWindowController, NSWindowDelegate { - private weak var delegate: TaskManagerDelegate? + private weak var delegate: TaskManagerDelegate? - @objc - public convenience init(delegate: TaskManagerDelegate) { - self.init() - self.delegate = delegate - } - - @IBAction public override func showWindow(_ sender: Any?) { - self.window = TaskManager.init() - self.window!.delegate = self - self.window!.makeKeyAndOrderFront(sender) - } - - public func windowWillClose(_ sender: Notification) { - self.delegate?.onTaskManagerClosed() - } - - public func windowDidResize(_ sender: Notification) { - guard self.window != nil else { return } - if !self.window!.inLiveResize { - self.taskManager().web_view.handleResize() + @objc + public convenience init(delegate: TaskManagerDelegate) { + self.init() + self.delegate = delegate } - } - public func windowDidChangeBackingProperties(_ sender: Notification) { - self.taskManager().web_view.handleDevicePixelRatioChange() - } + @IBAction public override func showWindow(_ sender: Any?) { + self.window = TaskManager.init() + self.window!.delegate = self + self.window!.makeKeyAndOrderFront(sender) + } - private func taskManager() -> TaskManager { - return self.window as! TaskManager - } + public func windowWillClose(_ sender: Notification) { + self.delegate?.onTaskManagerClosed() + } + + public func windowDidResize(_ sender: Notification) { + guard self.window != nil else { return } + if !self.window!.inLiveResize { + self.taskManager().web_view.handleResize() + } + } + + public func windowDidChangeBackingProperties(_ sender: Notification) { + self.taskManager().web_view.handleDevicePixelRatioChange() + } + + private func taskManager() -> TaskManager { + return self.window as! TaskManager + } }