mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-08 11:36:43 +02: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)
83 lines
2.1 KiB
C++
83 lines
2.1 KiB
C++
#if defined(Hiro_TabFrame)
|
|
|
|
namespace hiro {
|
|
|
|
auto pTabFrameItem::construct() -> void {
|
|
qtTabFrameItem = new QWidget;
|
|
|
|
if(auto parent = _parent()) {
|
|
parent->qtTabFrame->addTab(qtTabFrameItem, "");
|
|
}
|
|
|
|
_setState();
|
|
}
|
|
|
|
auto pTabFrameItem::destruct() -> void {
|
|
}
|
|
|
|
auto pTabFrameItem::append(sSizable sizable) -> void {
|
|
}
|
|
|
|
auto pTabFrameItem::remove(sSizable sizable) -> void {
|
|
}
|
|
|
|
auto pTabFrameItem::setClosable(bool closable) -> void {
|
|
}
|
|
|
|
auto pTabFrameItem::setGeometry(Geometry geometry) -> void {
|
|
if(auto& sizable = state().sizable) {
|
|
auto offset = qtTabFrameItem->geometry();
|
|
geometry.setPosition();
|
|
geometry.setWidth(geometry.width() - (geometry.width() - offset.width()));
|
|
geometry.setHeight(geometry.height() - (geometry.height() - offset.height()));
|
|
sizable->setGeometry(geometry);
|
|
}
|
|
}
|
|
|
|
auto pTabFrameItem::setIcon(const image& icon) -> void {
|
|
_setState();
|
|
}
|
|
|
|
auto pTabFrameItem::setMovable(bool movable) -> void {
|
|
}
|
|
|
|
auto pTabFrameItem::setSelected() -> void {
|
|
_setState();
|
|
}
|
|
|
|
auto pTabFrameItem::setText(const string& text) -> void {
|
|
_setState();
|
|
}
|
|
|
|
auto pTabFrameItem::setVisible(bool visible) -> void {
|
|
_setState();
|
|
}
|
|
|
|
auto pTabFrameItem::_parent() -> maybe<pTabFrame&> {
|
|
if(auto parent = self().parentTabFrame()) {
|
|
if(auto self = parent->self()) return *self;
|
|
}
|
|
return nothing;
|
|
}
|
|
|
|
auto pTabFrameItem::_setState() -> void {
|
|
if(auto parent = _parent()) {
|
|
parent->qtTabFrame->setTabIcon(self().offset(), CreateIcon(state().icon));
|
|
if(state().selected) parent->qtTabFrame->setCurrentIndex(self().offset());
|
|
parent->qtTabFrame->setTabText(self().offset(), QString::fromUtf8(state().text));
|
|
if(auto& sizable = state().sizable) {
|
|
auto geometry = parent->self().geometry();
|
|
auto offset = qtTabFrameItem->geometry();
|
|
geometry.setPosition({0, 0});
|
|
geometry.setWidth(geometry.width() - (geometry.width() - offset.width()));
|
|
geometry.setHeight(geometry.height() - (geometry.height() - offset.height()));
|
|
sizable->setGeometry(geometry);
|
|
sizable->setVisible(sizable->visible());
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|