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,68 +1,77 @@
namespace phoenix {
#if defined(Hiro_Widget)
QWidget* pWidget::container(Widget& widget) {
namespace hiro {
static auto ParentContainer(mObject& object) -> QWidget* {
if(auto frame = object.parentFrame()) {
if(auto self = frame->self()) return self->qtFrame;
}
if(auto tabFrameItem = object.parentTabFrameItem()) {
if(auto self = tabFrameItem->self()) return self->qtTabFrameItem;
}
if(auto window = object.parentWindow()) {
if(auto self = window->self()) return self->qtContainer;
}
if(auto parent = object.parent()) {
return ParentContainer(*parent);
}
return nullptr;
}
bool pWidget::focused() {
auto pWidget::construct() -> void {
if(!qtWidget) return;
if(auto container = ParentContainer(self())) {
qtWidget->setParent(container);
}
setFont(self().font(true));
setVisible(self().visible(true));
}
auto pWidget::destruct() -> void {
}
auto pWidget::focused() const -> bool {
if(!qtWidget) return false;
return qtWidget->hasFocus();
}
Size pWidget::minimumSize() {
return {0, 0};
}
void pWidget::setEnabled(bool enabled) {
if(!widget.parent()) enabled = false;
if(widget.state.abstract) enabled = false;
if(!widget.enabledToAll()) enabled = false;
auto pWidget::setEnabled(bool enabled) -> void {
if(!qtWidget) return;
qtWidget->setEnabled(enabled);
}
void pWidget::setFocused() {
auto pWidget::setFocused() -> void {
if(!qtWidget) return;
qtWidget->setFocus(Qt::OtherFocusReason);
}
void pWidget::setFont(string font) {
auto pWidget::setFont(const string& font) -> void {
if(!qtWidget) return;
qtWidget->setFont(pFont::create(font));
}
void pWidget::setGeometry(Geometry geometry) {
Position displacement = GetDisplacement(&widget);
geometry.x -= displacement.x;
geometry.y -= displacement.y;
qtWidget->setGeometry(geometry.x, geometry.y, geometry.width, geometry.height);
if(widget.onSize) widget.onSize();
auto pWidget::setGeometry(Geometry geometry) -> void {
if(!qtWidget) return;
// Position displacement = GetDisplacement(&widget);
// geometry.x -= displacement.x;
// geometry.y -= displacement.y;
qtWidget->setGeometry(geometry.x(), geometry.y(), geometry.width(), geometry.height());
self().doSize();
}
void pWidget::setVisible(bool visible) {
if(!widget.parent()) visible = false;
if(widget.state.abstract) visible = false;
if(!widget.visibleToAll()) visible = false;
auto pWidget::setVisible(bool visible) -> void {
if(!qtWidget) return;
qtWidget->setVisible(visible);
}
void pWidget::constructor() {
if(widget.state.abstract) qtWidget = new QWidget;
}
//pWidget::constructor() called before p{Derived}::constructor(); ergo qtWidget is not yet valid
//pWidget::synchronizeState() is called to finish construction of p{Derived}::constructor()
void pWidget::synchronizeState() {
setFont(widget.font());
}
void pWidget::destructor() {
if(widget.state.abstract) {
delete qtWidget;
qtWidget = nullptr;
}
}
void pWidget::orphan() {
destructor();
constructor();
}
//void pWidget::synchronizeState() {
// setFont(widget.font());
//}
}
#endif