Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2020-06-01 20:39:46 +01:00
27 changed files with 363 additions and 17 deletions

View File

@@ -318,6 +318,8 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
[this->window setColorSpace:[NSColorSpace sRGBColorSpace]];
this->color_space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
if (this->color_space == nullptr) this->color_space = CGColorSpaceCreateDeviceRGB();
if (this->color_space == nullptr) error("Could not get a valid colour space for drawing.");
bool ret = WindowResized();
this->UpdatePalette(0, 256);