2015-12-30 06:41:46 +00:00
|
|
|
#if defined(Hiro_Button)
|
|
|
|
|
2013-03-15 13:11:33 +00:00
|
|
|
@implementation CocoaButton : NSButton
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
-(id) initWith:(hiro::mButton&)buttonReference {
|
2013-03-15 13:11:33 +00:00
|
|
|
if(self = [super initWithFrame:NSMakeRect(0, 0, 0, 0)]) {
|
|
|
|
button = &buttonReference;
|
|
|
|
[self setTarget:self];
|
|
|
|
[self setAction:@selector(activate:)];
|
|
|
|
//NSRoundedBezelStyle has a fixed height; which breaks both icons and larger/smaller text
|
|
|
|
[self setBezelStyle:NSRegularSquareBezelStyle];
|
|
|
|
}
|
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2013-03-21 12:59:01 +00:00
|
|
|
-(IBAction) activate:(id)sender {
|
2015-12-30 06:41:46 +00:00
|
|
|
button->doActivate();
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
namespace hiro {
|
|
|
|
|
|
|
|
auto pButton::construct() -> void {
|
|
|
|
@autoreleasepool {
|
|
|
|
cocoaView = cocoaButton = [[CocoaButton alloc] initWith:self()];
|
|
|
|
pWidget::construct();
|
|
|
|
|
|
|
|
setBordered(state().bordered);
|
2016-01-07 08:14:33 +00:00
|
|
|
setIcon(state().icon);
|
2015-12-30 06:41:46 +00:00
|
|
|
setOrientation(state().orientation);
|
|
|
|
setText(state().text);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
auto pButton::destruct() -> void {
|
|
|
|
@autoreleasepool {
|
2016-01-07 08:14:33 +00:00
|
|
|
[cocoaView removeFromSuperview];
|
2015-12-30 06:41:46 +00:00
|
|
|
[cocoaView release];
|
|
|
|
}
|
|
|
|
}
|
2013-03-15 13:11:33 +00:00
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
auto pButton::minimumSize() const -> Size {
|
|
|
|
Size size = pFont::size(self().font(true), state().text);
|
2013-03-15 13:11:33 +00:00
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
if(state().orientation == Orientation::Horizontal) {
|
2016-01-07 08:14:33 +00:00
|
|
|
size.setWidth(size.width() + state().icon.width());
|
|
|
|
size.setHeight(max(size.height(), state().icon.height()));
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
if(state().orientation == Orientation::Vertical) {
|
2016-01-07 08:14:33 +00:00
|
|
|
size.setWidth(max(size.width(), state().icon.width()));
|
|
|
|
size.setHeight(size.height() + state().icon.height());
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
|
2016-01-07 08:14:33 +00:00
|
|
|
return {size.width() + (state().text ? 20 : 8), size.height() + 8};
|
Update to v094r09 release.
byuu says:
This will easily be the biggest diff in the history of higan. And not in
a good way.
* target-higan and target-loki have been blown away completely
* nall and ruby massively updated
* phoenix replaced with hiro (pretty near a total rewrite)
* target-higan restarted using hiro (just a window for now)
* all emulation cores updated to compile again
* installation changed to not require root privileges (installs locally)
For the foreseeable future (maybe even permanently?), the new higan UI
will only build under Linux/BSD with GTK+ 2.20+. Probably the most
likely route for Windows/OS X will be to try and figure out how to build
hiro/GTK on those platforms, as awful as that would be. The other
alternative would be to produce new UIs for those platforms ... which
would actually be a good opportunity to make something much more user
friendly.
Being that I just started on this a few hours ago, that means that for
at least a few weeks, don't expect to be able to actually play any
games. Right now, you can pretty much just compile the binary and that's
it. It's quite possible that some nall changes didn't produce
compilation errors, but will produce runtime errors. So until the UI can
actually load games, we won't know if anything is broken. But we should
mostly be okay. It was mostly just trim<1> -> trim changes, moving to
Hash::SHA256 (much cleaner), and patching some reckless memory copy
functions enough to compile.
Progress isn't going to be like it was before: I'm now dividing my time
much thinner between studying and other hobbies.
My aim this time is not to produce a binary for everyone to play games
on. Rather, it's to keep the emulator alive. I want to be able to apply
critical patches again. And I would also like the base of the emulator
to live on, for use in other emulator frontends that utilize higan.
2015-02-26 10:10:46 +00:00
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
auto pButton::setBordered(bool bordered) -> void {
|
2013-04-09 13:31:46 +00:00
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
auto pButton::setGeometry(Geometry geometry) -> void {
|
2013-04-09 13:31:46 +00:00
|
|
|
pWidget::setGeometry({
|
2015-12-30 06:41:46 +00:00
|
|
|
geometry.x() - 2, geometry.y() - 2,
|
|
|
|
geometry.width() + 4, geometry.height() + 4
|
2013-04-09 13:31:46 +00:00
|
|
|
});
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
|
2016-01-07 08:14:33 +00:00
|
|
|
auto pButton::setIcon(const image& icon) -> void {
|
2013-03-15 13:11:33 +00:00
|
|
|
@autoreleasepool {
|
2016-01-07 08:14:33 +00:00
|
|
|
[cocoaView setImage:NSMakeImage(icon)];
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
auto pButton::setOrientation(Orientation orientation) -> void {
|
2013-03-15 13:11:33 +00:00
|
|
|
@autoreleasepool {
|
2015-12-30 06:41:46 +00:00
|
|
|
if(orientation == Orientation::Horizontal) [cocoaView setImagePosition:NSImageLeft];
|
|
|
|
if(orientation == Orientation::Vertical ) [cocoaView setImagePosition:NSImageAbove];
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
auto pButton::setText(const string& text) -> void {
|
2013-03-15 13:11:33 +00:00
|
|
|
@autoreleasepool {
|
2015-12-30 06:41:46 +00:00
|
|
|
[cocoaView setTitle:[NSString stringWithUTF8String:text]];
|
2013-03-15 13:11:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-12-30 06:41:46 +00:00
|
|
|
#endif
|