Noise texture is no longer updated if a window is in the background a…

…nd "Pause emulation while in background" is activated. (#763)
dirkwhoffmann · Jan 25, 2024 · 63f9a1a · 63f9a1a
1 parent 55aadf4
commit 63f9a1a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/GUI/Layers/Canvas.swift b/GUI/Layers/Canvas.swift
@@ -199,7 +199,9 @@ class Canvas: Layer {
 
             let w = TextureSize.original.width
             let h = TextureSize.original.height
-            emulatorTexture.replace(w: w, h: h, buffer: c64.vic.noise)
+            if !controller.inBackground || !controller.pref.pauseInBackground {
+                emulatorTexture.replace(w: w, h: h, buffer: c64.vic.noise)
+            }
             return
         }
 

diff --git a/GUI/Layers/Console.swift b/GUI/Layers/Console.swift
@@ -12,8 +12,6 @@ import Carbon.HIToolbox
 
 class Console: Layer {
 
-    let controller: MyController
-
     var window: NSWindow { return controller.window! }
     var contentView: NSView { return window.contentView! }
 
@@ -27,9 +25,7 @@ class Console: Layer {
     //
 
     override init(renderer: Renderer) {
-
-        controller = renderer.parent
-
+
         textView = (scrollView.documentView as? NSTextView)!
         textView.isEditable = false
         textView.backgroundColor = NSColor(r: 0x80, g: 0x80, b: 0x80, a: 0x80)

diff --git a/GUI/Layers/DropZone.swift b/GUI/Layers/DropZone.swift
@@ -11,8 +11,6 @@ import Foundation
 
 class DropZone: Layer {
 
-    let controller: MyController
-
     var window: NSWindow { return controller.window! }
     var contentView: NSView { return window.contentView! }
     var metal: MetalView { return controller.metal! }
@@ -48,9 +46,7 @@ class DropZone: Layer {
     //
 
     override init(renderer: Renderer) {
-
-        controller = renderer.parent
-
+
         for i in 0...4 { zones[i].unregisterDraggedTypes() }
         super.init(renderer: renderer)
         resize()

diff --git a/GUI/Layers/Layer.swift b/GUI/Layers/Layer.swift
@@ -11,6 +11,7 @@ class Layer: NSObject {
 
     let renderer: Renderer
 
+    var controller : MyController { return renderer.parent }
     var ressourceManager: RessourceManager { return renderer.ressourceManager }
     var device: MTLDevice { return renderer.device }
     var view: MTKView { return renderer.view }

diff --git a/GUI/MyController.swift b/GUI/MyController.swift
@@ -81,6 +81,9 @@ class MyController: NSWindowController, MessageReceiver {
     var smallTape = NSImage(named: "tapeTemplate")!.resize(size: iconSize)
     var smallCart = NSImage(named: "crtTemplate")!.resize(size: iconSize)
 
+    // Indicates if the window is in background
+    var inBackground = false
+
     // Remembers the running state for the pauseInBackground feature
     var pauseInBackgroundSavedState = false
 

diff --git a/GUI/WindowDelegate.swift b/GUI/WindowDelegate.swift
@@ -13,6 +13,8 @@ extension MyController: NSWindowDelegate {
 
         guard let window = notification.object as? NSWindow else { return }
 
+        inBackground = false
+
         // Inform the application delegate
         myAppDelegate.windowDidBecomeMain(window)
 
@@ -31,6 +33,8 @@ extension MyController: NSWindowDelegate {
 
     public func windowDidResignMain(_ notification: Notification) {
 
+        inBackground = true
+
         // Stop the emulator if it is supposed to pause in background
         if c64 != nil {
             pauseInBackgroundSavedState = c64.running