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)
87 lines
2 KiB
C++
87 lines
2 KiB
C++
#if defined(Hiro_Frame)
|
|
|
|
@implementation CocoaFrame : NSBox
|
|
|
|
-(id) initWith:(hiro::mFrame&)frameReference {
|
|
if(self = [super initWithFrame:NSMakeRect(0, 0, 0, 0)]) {
|
|
frame = &frameReference;
|
|
|
|
[self setTitle:@""];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
namespace hiro {
|
|
|
|
auto pFrame::construct() -> void {
|
|
@autoreleasepool {
|
|
cocoaView = cocoaFrame = [[CocoaFrame alloc] initWith:self()];
|
|
pWidget::construct();
|
|
|
|
setText(state().text);
|
|
}
|
|
}
|
|
|
|
auto pFrame::destruct() -> void {
|
|
@autoreleasepool {
|
|
[cocoaView removeFromSuperview];
|
|
[cocoaView release];
|
|
}
|
|
}
|
|
|
|
auto pFrame::append(sSizable sizable) -> void {
|
|
}
|
|
|
|
auto pFrame::remove(sSizable sizable) -> void {
|
|
}
|
|
|
|
auto pFrame::setEnabled(bool enabled) -> void {
|
|
pWidget::setEnabled(enabled);
|
|
if(auto sizable = _sizable()) sizable->setEnabled(sizable->self().enabled(true));
|
|
}
|
|
|
|
auto pFrame::setFont(const Font& font) -> void {
|
|
@autoreleasepool {
|
|
[cocoaView setTitleFont:pFont::create(font)];
|
|
}
|
|
if(auto sizable = _sizable()) sizable->setFont(sizable->self().font(true));
|
|
}
|
|
|
|
auto pFrame::setGeometry(Geometry geometry) -> void {
|
|
bool empty = !state().text;
|
|
Size size = pFont::size(self().font(true), state().text);
|
|
pWidget::setGeometry({
|
|
geometry.x() - 3, geometry.y() - (empty ? size.height() - 2 : 1),
|
|
geometry.width() + 6, geometry.height() + (empty ? size.height() + 2 : 5)
|
|
});
|
|
if(auto sizable = _sizable()) {
|
|
sizable->setGeometry({
|
|
geometry.x() + 1, geometry.y() + (empty ? 1 : size.height() - 2),
|
|
geometry.width() - 2, geometry.height() - (empty ? 1 : size.height() - 1)
|
|
});
|
|
}
|
|
}
|
|
|
|
auto pFrame::setText(const string& text) -> void {
|
|
@autoreleasepool {
|
|
[cocoaView setTitle:[NSString stringWithUTF8String:text]];
|
|
}
|
|
}
|
|
|
|
auto pFrame::setVisible(bool visible) -> void {
|
|
pWidget::setVisible(visible);
|
|
if(auto sizable = _sizable()) sizable->setVisible(sizable->self().visible(true));
|
|
}
|
|
|
|
auto pFrame::_sizable() -> maybe<pSizable&> {
|
|
if(auto sizable = state().sizable) {
|
|
if(auto self = sizable->self()) return *self;
|
|
}
|
|
return {};
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|