Update to v094r40 release.

byuu says:

Changelog:
- updated to newest hiro API
- SFC performance profile builds once again
- hiro: Qt port completed

Errata 1: the hiro/Qt target won't run tomoko just yet. Starts by
crashing inside InputSettings because hiro/Qt isn't forcefully selecting
the first item added to a ComboButton just yet. Even with a monkey patch
to get around that, the UI is incredibly unstable. Lots of geometry
calculation bugs, and a crash when you try and access certain folders in
the browser dialog. Lots of work left to be done there, sadly.

Errata 2: the hiro/Windows port has black backgrounds on all ListView
items. It's because I need to test for unassigned colors and grab the
default Windows brush colors in those cases.

Note: alternating row colors on multi-column ListView widgets is gone
now. Not a bug. May add it back later, but I'm not sure. It doesn't
interact nicely with per-cell background colors.

Things left to do:

First, I have to fix the Windows and Qt target bugs.

Next, I need to go through and revise the hiro API even more (nothing
too major.)

Next, I need to update icarus to use the new hiro API, and add support
for the SFC games database.

Next, I have to rewrite my TSV->BML cheat code tool.

Next, I need to post a final WIP of higan+icarus publicly and wait a few
days.

Next, I need to fix any bugs reported from the final WIP that I can.

Finally, I should be able to release v095.
This commit is contained in:
Tim Allen
2015-08-18 20:18:00 +10:00
parent 0271d6a12b
commit 4344b916b6
200 changed files with 7246 additions and 5659 deletions

View File

@@ -1,62 +1,66 @@
namespace phoenix {
#if defined(Hiro_Button)
Size pButton::minimumSize() {
Size size = pFont::size(qtWidget->font(), button.state.text);
namespace hiro {
if(button.state.orientation == Orientation::Horizontal) {
size.width += button.state.image.width;
size.height = max(button.state.image.height, size.height);
}
auto pButton::construct() -> void {
qtWidget = qtButton = new QtButton(*this);
qtButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
qtButton->connect(qtButton, SIGNAL(released()), SLOT(onActivate()));
if(button.state.orientation == Orientation::Vertical) {
size.width = max(button.state.image.width, size.width);
size.height += button.state.image.height;
}
setBordered(state().bordered);
setIcon(state().icon);
setOrientation(state().orientation);
setText(state().text);
return {size.width + (button.state.text ? 20 : 12), size.height + 12};
pWidget::construct();
}
void pButton::setBordered(bool bordered) {
qtButton->setAutoRaise(bordered == false);
auto pButton::destruct() -> void {
delete qtButton;
qtWidget = qtButton = nullptr;
}
void pButton::setImage(const image& image, Orientation orientation) {
qtButton->setIconSize(QSize(image.width, image.height));
qtButton->setIcon(CreateIcon(image));
auto pButton::minimumSize() const -> Size {
auto size = pFont::size(qtWidget->font(), state().text);
if(state().orientation == Orientation::Horizontal) {
size.setWidth(size.width() + state().icon.width());
size.setHeight(max(state().icon.height(), size.height()));
}
if(state().orientation == Orientation::Vertical) {
size.setWidth(max(state().icon.width(), size.width()));
size.setHeight(size.height() + state().icon.height());
}
return {size.width() + (state().text ? 20 : 12), size.height() + 12};
}
auto pButton::setBordered(bool bordered) -> void {
qtButton->setAutoRaise(!bordered);
}
auto pButton::setIcon(const image& icon) -> void {
qtButton->setIconSize(QSize(icon.width(), icon.height()));
qtButton->setIcon(CreateIcon(icon));
qtButton->setStyleSheet("text-align: top;");
}
auto pButton::setOrientation(Orientation orientation) -> void {
switch(orientation) {
case Orientation::Horizontal: qtButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); break;
case Orientation::Vertical: qtButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); break;
}
}
void pButton::setText(string text) {
auto pButton::setText(const string& text) -> void {
qtButton->setText(QString::fromUtf8(text));
}
void pButton::constructor() {
qtWidget = qtButton = new QToolButton;
qtButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
connect(qtButton, SIGNAL(released()), SLOT(onActivate()));
pWidget::synchronizeState();
setBordered(button.state.bordered);
setImage(button.state.image, button.state.orientation);
setText(button.state.text);
}
void pButton::destructor() {
delete qtButton;
qtWidget = qtButton = nullptr;
}
void pButton::orphan() {
destructor();
constructor();
}
void pButton::onActivate() {
if(button.onActivate) button.onActivate();
auto QtButton::onActivate() -> void {
p.self().doActivate();
}
}
#endif