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)
50 lines
1.2 KiB
C++
50 lines
1.2 KiB
C++
#if defined(Hiro_ComboButton)
|
|
|
|
namespace hiro {
|
|
|
|
auto pComboButton::construct() -> void {
|
|
qtWidget = qtComboButton = new QtComboButton(*this);
|
|
qtComboButton->connect(qtComboButton, SIGNAL(currentIndexChanged(int)), SLOT(onChange(int)));
|
|
|
|
pWidget::construct();
|
|
}
|
|
|
|
auto pComboButton::destruct() -> void {
|
|
if(Application::state.quit) return; //TODO: hack
|
|
delete qtComboButton;
|
|
qtWidget = qtComboButton = nullptr;
|
|
}
|
|
|
|
auto pComboButton::append(sComboButtonItem item) -> void {
|
|
}
|
|
|
|
auto pComboButton::minimumSize() const -> Size {
|
|
signed maximumWidth = 0;
|
|
for(auto& item : state().items) {
|
|
maximumWidth = max(maximumWidth, pFont::size(qtWidget->font(), item->state.text).width());
|
|
}
|
|
auto size = pFont::size(qtWidget->font(), " ");
|
|
return {maximumWidth + 32, size.height() + 12};
|
|
}
|
|
|
|
auto pComboButton::remove(sComboButtonItem item) -> void {
|
|
}
|
|
|
|
auto pComboButton::reset() -> void {
|
|
auto lock = acquire();
|
|
while(qtComboButton->count()) qtComboButton->removeItem(0);
|
|
}
|
|
|
|
auto QtComboButton::onChange(int offset) -> void {
|
|
for(auto& item : p.state().items) {
|
|
item->state.selected = false;
|
|
}
|
|
if(auto item = p.self().item(offset)) {
|
|
item->state.selected = true;
|
|
}
|
|
if(!p.locked()) p.self().doChange();
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|