6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-03 22:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed mismatch in television/monitor selection, ticked view for drawing concurrently, since it can, removed stray space.

Browse Source
This commit is contained in:
Thomas Harte 2016-04-18 19:01:15 -04:00
parent 3d53f157de
commit bf29c8e2bf
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OSBindings/Mac/Clock Signal/Base.lproj/Atari2600Document.xib
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies>

2
OSBindings/Mac/Clock Signal/Base.lproj/ElectronDocument.xib
View File

@ -22,7 +22,7 @@
<rect key="contentRect" x="133" y="235" width="440" height="400"/>
<rect key="screenRect" x="0.0" y="0.0" width="1366" height="768"/>
<value key="minSize" type="size" width="228" height="171"/>
<view key="contentView" id="gIp-Ho-8D9" customClass="CSOpenGLView">
<view key="contentView" canDrawConcurrently="YES" id="gIp-Ho-8D9" customClass="CSOpenGLView">
<rect key="frame" x="0.0" y="0.0" width="440" height="400"/>
<autoresizingMask key="autoresizingMask"/>
</view>

5
OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift
View File

@ -74,10 +74,7 @@ class ElectronDocument: MachineDocument {
// MARK: IBActions
@IBOutlet var displayTypeButton: NSPopUpButton!
@IBAction func setDisplayType(sender: NSPopUpButton!) {
switch sender.indexOfSelectedItem {
case 1: electron.useTelevisionOutput = false
default: electron.useTelevisionOutput = true
}
electron.useTelevisionOutput = (sender.indexOfSelectedItem == 1)
NSUserDefaults.standardUserDefaults().setInteger(sender.indexOfSelectedItem, forKey: self.displayTypeUserDefaultsKey)
}

2
Outputs/CRT/Internals/CRTOpenGL.cpp
View File

@ -681,7 +681,7 @@ void OpenGLOutputBuilder::prepare_output_vertex_array()
void OpenGLOutputBuilder::set_output_device(OutputDevice output_device)
{
if (_output_device != output_device)
if(_output_device != output_device)
{
_output_device = output_device;