mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-04-02 10:42:14 -04:00
393c2395bb
byuu says:
The problems with the Windows and Qt4 ports have all been resolved,
although there's a fairly gross hack on a few Qt widgets to not destruct
once Application::quit() is called to avoid a double free crash (I'm
unsure where Qt is destructing the widgets internally.) The Cocoa port
compiles again at least, though it's bound to have endless problems. I
improved the Label painting in the GTK ports, which fixes the background
color on labels inside TabFrame widgets.
I've optimized the Makefile system even further.
I added a "redo state" command to bsnes, which is created whenever you
load the undo state. There are also hotkeys for both now, although I
don't think they're really something you want to map hotkeys to.
I moved the nall::Locale object inside hiro::Application, so that it can
be used to translate the BrowserDialog and MessageDialog window strings.
I improved the Super Game Boy emulation of `MLT_REQ`, fixing Pokemon
Yellow's custom border and probably more stuff.
Lots of other small fixes and improvements. Things are finally stable
once again after the harrowing layout redesign catastrophe.
Errata:
- ICD::joypID should be set to 3 on reset(). joypWrite() may as well
take uint1 instead of bool.
- hiro/Qt: remove pWindow::setMaximumSize() comment; found a
workaround for it
- nall/GNUmakefile: don't set object.path if it's already set (allow
overrides before including the file)
52 lines
1.2 KiB
C++
52 lines
1.2 KiB
C++
#if defined(Hiro_Monitor)
|
|
|
|
namespace hiro {
|
|
|
|
auto pMonitor::count() -> uint {
|
|
@autoreleasepool {
|
|
return [[NSScreen screens] count];
|
|
}
|
|
}
|
|
|
|
auto pMonitor::dpi(uint monitor) -> Position {
|
|
@autoreleasepool {
|
|
NSScreen* screen = [[NSScreen screens] objectAtIndex:monitor];
|
|
NSDictionary* dictionary = [screen deviceDescription];
|
|
NSSize dpi = [[dictionary objectForKey:NSDeviceSize] sizeValue];
|
|
return {dpi.width, dpi.height};
|
|
}
|
|
}
|
|
|
|
auto pMonitor::geometry(uint monitor) -> Geometry {
|
|
@autoreleasepool {
|
|
NSRect rectangle = [[[NSScreen screens] objectAtIndex:monitor] frame];
|
|
return {
|
|
(int)rectangle.origin.x,
|
|
(int)rectangle.origin.y,
|
|
(int)rectangle.size.width,
|
|
(int)rectangle.size.height
|
|
};
|
|
}
|
|
}
|
|
|
|
auto pMonitor::primary() -> uint {
|
|
//on macOS, the primary monitor is always the first monitor
|
|
return 0;
|
|
}
|
|
|
|
auto pMonitor::workspace(uint monitor) -> Geometry {
|
|
@autoreleasepool {
|
|
NSRect size = [[[NSScreen screens] objectAtIndex:monitor] frame];
|
|
NSRect area = [[[NSScreen screens] objectAtIndex:monitor] visibleFrame];
|
|
return {
|
|
(int)area.origin.x,
|
|
(int)area.origin.y,
|
|
(int)area.size.width,
|
|
(int)area.size.height
|
|
};
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|