Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
#if defined(Hiro_TableLayout)
|
|
|
|
|
|
|
|
auto mTableLayout::alignment() const -> Alignment {
|
|
|
|
return state.alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::append(sSizable sizable, Size size) -> type& {
|
2018-08-01 09:07:28 +00:00
|
|
|
for(auto& cell : state.cells) {
|
|
|
|
if(cell->state.sizable == sizable) return *this;
|
|
|
|
}
|
|
|
|
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
TableLayoutCell cell;
|
|
|
|
cell->setSizable(sizable);
|
|
|
|
cell->setSize(size);
|
|
|
|
cell->setParent(this, cellCount());
|
|
|
|
state.cells.append(cell);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::cell(uint position) const -> TableLayoutCell {
|
|
|
|
return state.cells(position, {});
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::cell(uint x, uint y) const -> TableLayoutCell {
|
|
|
|
if(auto cell = state.cells(y * columnCount() + x, {})) return cell;
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::cell(sSizable sizable) const -> TableLayoutCell {
|
|
|
|
for(auto& cell : state.cells) {
|
|
|
|
if(cell->state.sizable == sizable) return cell;
|
|
|
|
}
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::cellCount() const -> uint {
|
|
|
|
return state.cells.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::column(uint position) const -> TableLayoutColumn {
|
|
|
|
return state.columns(position, {});
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::columnCount() const -> uint {
|
|
|
|
return state.columns.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::destruct() -> void {
|
|
|
|
for(auto& cell : state.cells) cell->destruct();
|
|
|
|
for(auto& column : state.columns) column->destruct();
|
|
|
|
for(auto& row : state.rows) row->destruct();
|
|
|
|
mSizable::destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::minimumSize() const -> Size {
|
|
|
|
float minimumWidth = 0;
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
float width = 0;
|
|
|
|
auto column = this->column(x);
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
auto row = this->row(y);
|
|
|
|
auto cell = this->cell(x, y);
|
|
|
|
if(cell.size().width() == Size::Minimum || cell.size().width() == Size::Maximum) {
|
|
|
|
width = max(width, cell.sizable()->minimumSize().width());
|
|
|
|
} else {
|
|
|
|
width = max(width, cell.size().width());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
minimumWidth += width;
|
|
|
|
if(x != columnCount() - 1) minimumWidth += column.spacing();
|
|
|
|
}
|
|
|
|
|
|
|
|
float minimumHeight = 0;
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
float height = 0;
|
|
|
|
auto row = this->row(y);
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
auto column = this->column(x);
|
|
|
|
auto cell = this->cell(x, y);
|
|
|
|
if(cell.size().height() == Size::Minimum || cell.size().height() == Size::Maximum) {
|
|
|
|
height = max(height, cell.sizable()->minimumSize().height());
|
|
|
|
} else {
|
|
|
|
height = max(height, cell.size().height());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
minimumHeight += height;
|
|
|
|
if(y != rowCount() - 1) minimumHeight += row.spacing();
|
|
|
|
}
|
|
|
|
|
|
|
|
return {
|
|
|
|
padding().x() + minimumWidth + padding().width(),
|
|
|
|
padding().y() + minimumHeight + padding().height()
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::padding() const -> Geometry {
|
|
|
|
return state.padding;
|
|
|
|
}
|
|
|
|
|
Update to 20180729 release.
byuu wrote:
Sigh ...
asio.hpp needs #include <nall/windows/registry.hpp>
[Since the last WIP, byuu also posted the following message. -Ed.]
ruby drivers have all been updated (but not tested outside of BSD), and
I redesigned the settings window. The driver functionality all exists on
a new "Drivers" panel, the emulator/hack settings go to a
"Configuration" panel, and the video/audio panels lose driver settings.
As does the settings menu and its synchronize options.
I want to start pushing toward a v107 release. Critically, I will need
DirectSound and ALSA to support dynamic rate control. I'd also like to
eliminate the other system manifest.bml files. I need to update the
cheat code database format, and bundle at least a few quark shaders --
although I still need to default to Direct3D on Windows.
Turbo keys would be nice, if it's not too much effort. Aside from
netplay, it's the last significant feature I'm missing.
I think for v107, higan is going to be a bit rough around the edges
compared to bsnes. And I don't think it's practical to finish the bsnes
localization support.
I'm thinking we probably want another WIP to iron out any critical
issues, but this time there should be a feature freeze with the next
WIP.
2018-07-29 13:24:38 +00:00
|
|
|
auto mTableLayout::remove(sSizable sizable) -> type& {
|
|
|
|
for(auto& cell : state.cells) {
|
|
|
|
if(cell->state.sizable == sizable) return remove(cell);
|
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
auto mTableLayout::remove(sTableLayoutCell cell) -> type& {
|
|
|
|
if(cell->parent() != this) return *this;
|
|
|
|
auto offset = cell->offset();
|
|
|
|
cell->setParent();
|
|
|
|
state.cells.remove(offset);
|
|
|
|
for(uint n : range(offset, cellCount())) state.cells[n]->adjustOffset(-1);
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::reset() -> type& {
|
|
|
|
while(state.cells) remove(state.cells.right());
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::row(uint position) const -> TableLayoutRow {
|
|
|
|
return state.rows(position, {});
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::rowCount() const -> uint {
|
|
|
|
return state.rows.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setAlignment(Alignment alignment) -> type& {
|
|
|
|
state.alignment = alignment;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setEnabled(bool enabled) -> type& {
|
|
|
|
mSizable::setEnabled(enabled);
|
|
|
|
for(auto& cell : state.cells) cell.setEnabled(cell.enabled());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setFont(const Font& font) -> type& {
|
|
|
|
mSizable::setFont(font);
|
|
|
|
for(auto& cell : state.cells) cell.setFont(cell.font());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2019-01-01 23:52:08 +00:00
|
|
|
auto mTableLayout::setGeometry(Geometry requestedGeometry) -> type& {
|
|
|
|
if(!visible(true)) return mSizable::setGeometry(requestedGeometry), *this;
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
|
2019-01-01 23:52:08 +00:00
|
|
|
auto geometry = requestedGeometry;
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
geometry.setX(geometry.x() + padding().x());
|
|
|
|
geometry.setY(geometry.y() + padding().y());
|
|
|
|
geometry.setWidth (geometry.width() - padding().x() - padding().width());
|
|
|
|
geometry.setHeight(geometry.height() - padding().y() - padding().height());
|
|
|
|
|
|
|
|
vector<float> widths;
|
|
|
|
widths.resize(columnCount());
|
|
|
|
uint maximumWidths = 0;
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
float width = 0;
|
|
|
|
auto column = this->column(x);
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
auto row = this->row(y);
|
|
|
|
auto cell = this->cell(x, y);
|
|
|
|
if(cell.size().width() == Size::Maximum) {
|
|
|
|
width = Size::Maximum;
|
|
|
|
maximumWidths++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if(cell.size().width() == Size::Minimum) {
|
|
|
|
width = max(width, cell.sizable()->minimumSize().width());
|
|
|
|
} else {
|
|
|
|
width = max(width, cell.size().width());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
widths[x] = width;
|
|
|
|
}
|
|
|
|
|
|
|
|
vector<float> heights;
|
|
|
|
heights.resize(rowCount());
|
|
|
|
uint maximumHeights = 0;
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
float height = 0;
|
|
|
|
auto row = this->row(y);
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
auto column = this->column(x);
|
|
|
|
auto cell = this->cell(x, y);
|
|
|
|
if(cell.size().height() == Size::Maximum) {
|
|
|
|
height = Size::Maximum;
|
|
|
|
maximumHeights++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if(cell.size().height() == Size::Minimum) {
|
|
|
|
height = max(height, cell.sizable()->minimumSize().height());
|
|
|
|
} else {
|
|
|
|
height = max(height, cell.size().height());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
heights[y] = height;
|
|
|
|
}
|
|
|
|
|
|
|
|
float fixedWidth = 0;
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
if(widths[x] != Size::Maximum) fixedWidth += widths[x];
|
|
|
|
if(x != columnCount() - 1) fixedWidth += column(x)->spacing();
|
|
|
|
}
|
|
|
|
float maximumWidth = (geometry.width() - fixedWidth) / maximumWidths;
|
|
|
|
for(auto& width : widths) {
|
|
|
|
if(width == Size::Maximum) width = maximumWidth;
|
|
|
|
}
|
|
|
|
|
|
|
|
float fixedHeight = 0;
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
if(heights[y] != Size::Maximum) fixedHeight += heights[y];
|
|
|
|
if(y != rowCount() - 1) fixedHeight += row(y)->spacing();
|
|
|
|
}
|
|
|
|
float maximumHeight = (geometry.height() - fixedHeight) / maximumHeights;
|
|
|
|
for(auto& height : heights) {
|
|
|
|
if(height == Size::Maximum) height = maximumHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
float geometryY = geometry.y();
|
|
|
|
for(uint y : range(rowCount())) {
|
|
|
|
float geometryX = geometry.x();
|
|
|
|
auto row = this->row(y);
|
|
|
|
for(uint x : range(columnCount())) {
|
|
|
|
auto column = this->column(x);
|
|
|
|
auto cell = this->cell(x, y);
|
|
|
|
float geometryWidth = widths [x];
|
|
|
|
float geometryHeight = heights[y];
|
|
|
|
auto alignment = cell.alignment();
|
|
|
|
if(!alignment) alignment = column.alignment();
|
|
|
|
if(!alignment) alignment = row.alignment();
|
|
|
|
if(!alignment) alignment = this->alignment();
|
|
|
|
if(!alignment) alignment = {0.0, 0.5};
|
|
|
|
|
|
|
|
float cellWidth = cell.size().width();
|
|
|
|
if(cellWidth == Size::Minimum) cellWidth = cell.sizable()->minimumSize().width();
|
|
|
|
if(cellWidth == Size::Maximum) cellWidth = geometryWidth;
|
|
|
|
cellWidth = min(cellWidth, geometryWidth);
|
|
|
|
float cellHeight = cell.size().height();
|
|
|
|
if(cellHeight == Size::Minimum) cellHeight = cell.sizable()->minimumSize().height();
|
|
|
|
if(cellHeight == Size::Maximum) cellHeight = geometryHeight;
|
|
|
|
cellHeight = min(cellHeight, geometryHeight);
|
|
|
|
float cellX = geometryX + alignment.horizontal() * (geometryWidth - cellWidth);
|
|
|
|
float cellY = geometryY + alignment.vertical() * (geometryHeight - cellHeight);
|
|
|
|
cell.sizable()->setGeometry({cellX, cellY, cellWidth, cellHeight});
|
|
|
|
|
|
|
|
geometryX += widths[x] + column.spacing();
|
|
|
|
}
|
|
|
|
geometryY += heights[y] + row.spacing();
|
|
|
|
}
|
|
|
|
|
2019-01-01 23:52:08 +00:00
|
|
|
mSizable::setGeometry(requestedGeometry);
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setPadding(Geometry padding) -> type& {
|
|
|
|
state.padding = padding;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setParent(mObject* parent, int offset) -> type& {
|
|
|
|
for(auto& cell : reverse(state.cells)) cell->destruct();
|
|
|
|
for(auto& column : reverse(state.columns)) column->destruct();
|
|
|
|
for(auto& row : reverse(state.rows)) row->destruct();
|
|
|
|
mObject::setParent(parent, offset);
|
|
|
|
for(auto& cell : state.cells) cell->setParent(this, cell->offset());
|
|
|
|
for(auto& column : state.columns) column->setParent(this, column->offset());
|
|
|
|
for(auto& row : state.rows) row->setParent(this, row->offset());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setSize(Size size) -> type& {
|
|
|
|
state.size = size;
|
|
|
|
state.columns.reset();
|
|
|
|
state.rows.reset();
|
|
|
|
for(auto x : range(size.width())) state.columns.append(TableLayoutColumn());
|
|
|
|
for(auto y : range(size.height())) state.rows.append(TableLayoutRow());
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::setVisible(bool visible) -> type& {
|
|
|
|
mSizable::setVisible(visible);
|
|
|
|
for(auto& cell : state.cells) cell.setVisible(cell.visible());
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::size() const -> Size {
|
|
|
|
return state.size;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayout::synchronize() -> type& {
|
|
|
|
setGeometry(geometry());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
auto mTableLayoutColumn::alignment() const -> Alignment {
|
|
|
|
return state.alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutColumn::setAlignment(Alignment alignment) -> type& {
|
|
|
|
state.alignment = alignment;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutColumn::setSpacing(float spacing) -> type& {
|
|
|
|
state.spacing = spacing;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutColumn::spacing() const -> float {
|
|
|
|
return state.spacing;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutColumn::synchronize() -> type& {
|
|
|
|
if(auto parent = this->parent()) {
|
|
|
|
if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
|
|
|
|
tableLayout->synchronize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
auto mTableLayoutRow::alignment() const -> Alignment {
|
|
|
|
return state.alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutRow::setAlignment(Alignment alignment) -> type& {
|
|
|
|
state.alignment = alignment;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutRow::setSpacing(float spacing) -> type& {
|
|
|
|
state.spacing = spacing;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutRow::spacing() const -> float {
|
|
|
|
return state.spacing;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutRow::synchronize() -> type& {
|
|
|
|
if(auto parent = this->parent()) {
|
|
|
|
if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
|
|
|
|
tableLayout->synchronize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
auto mTableLayoutCell::alignment() const -> Alignment {
|
|
|
|
return state.alignment;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::destruct() -> void {
|
|
|
|
if(auto& sizable = state.sizable) sizable->destruct();
|
|
|
|
mObject::destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setAlignment(Alignment alignment) -> type& {
|
|
|
|
state.alignment = alignment;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setEnabled(bool enabled) -> type& {
|
|
|
|
mObject::setEnabled(enabled);
|
|
|
|
state.sizable->setEnabled(state.sizable->enabled());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setFont(const Font& font) -> type& {
|
|
|
|
mObject::setFont(font);
|
|
|
|
state.sizable->setFont(state.sizable->font());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setParent(mObject* parent, int offset) -> type& {
|
|
|
|
state.sizable->destruct();
|
|
|
|
mObject::setParent(parent, offset);
|
|
|
|
state.sizable->setParent(this, 0);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setSizable(sSizable sizable) -> type& {
|
|
|
|
state.sizable = sizable;
|
|
|
|
state.sizable->setParent(this, 0);
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setSize(Size size) -> type& {
|
|
|
|
state.size = size;
|
|
|
|
return synchronize();
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::setVisible(bool visible) -> type& {
|
|
|
|
mObject::setVisible(visible);
|
|
|
|
state.sizable->setVisible(state.sizable->visible());
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::sizable() const -> Sizable {
|
2018-07-16 06:16:26 +00:00
|
|
|
return state.sizable ? state.sizable : Sizable();
|
Update to v106r47 release.
byuu says:
This is probably the largest code-change diff I've done in years.
I spent four days working 10-16 hours a day reworking layouts in hiro
completely.
The result is we now have TableLayout, which will allow for better
horizontal+vertical combined alignment.
Windows, GTK2, and now GTK3 are fully supported.
Windows is getting the initial window geometry wrong by a bit.
GTK2 and GTK3 work perfectly. I basically abandoned trying to detect
resize signals, and instead keep a list of all hiro windows that are
allocated, and every time the main loop runs, it will query all of them
to see if they've been resized. I'm disgusted that I have to do this,
but after fighting with GTK for years, I'm about sick of it. GTK was
doing this crazy thing where it would trigger another size-allocate
inside of a previous size-allocate, and so my layouts would be halfway
through resizing all the widgets, and then the size-allocate would kick
off another one. That would end up leaving the rest of the first layout
loop with bad widget sizes. And if I detected a second re-entry and
blocked it, then the entire window would end up with the older geometry.
I started trying to build a message queue system to allow the second
layout resize to occur after the first one completed, but this was just
too much madness, so I went with the simpler solution.
Qt4 has some geometry problems, and doesn't show tab frame layouts
properly yet.
Qt5 causes an ICE error and tanks my entire Xorg display server, so ...
something is seriously wrong there, and it's not hiro's fault. Creating
a dummy Qt5 application without even using hiro, just int main() {
TestObject object; } with object performing a dynamic\_cast to a derived
type segfaults. Memory is getting corrupted where GCC allocates the
vtables for classes, just by linking in Qt. Could be somehow related to
the -fPIC requirement that only Qt5 has ... could just be that FreeBSD
10.1 has a buggy implementation of Qt5. I don't know. It's beyond my
ability to debug, so this one's going to stay broken.
The Cocoa port is busted. I'll fix it up to compile again, but that's
about all I'm going to do.
Many optimizations mean bsnes and higan open faster. GTK2 and GTK3 both
resize windows very quickly now.
higan crashes when you load a game, so that's not good. bsnes works
though.
bsnes also has the start of a localization engine now. Still a long way
to go.
The makefiles received a rather substantial restructuring. Including the
ruby and hiro makefiles will add the necessary compilation rules for
you, which also means that moc will run for the qt4 and qt5 targets, and
windres will run for the Windows targets.
2018-07-14 03:59:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::size() const -> Size {
|
|
|
|
return state.size;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto mTableLayoutCell::synchronize() -> type& {
|
|
|
|
if(auto parent = this->parent()) {
|
|
|
|
if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
|
|
|
|
tableLayout->synchronize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|