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)
72 lines
1.8 KiB
C++
72 lines
1.8 KiB
C++
#if defined(Hiro_Frame)
|
|
|
|
namespace hiro {
|
|
|
|
auto pFrame::construct() -> void {
|
|
gtkWidget = gtk_frame_new(nullptr);
|
|
gtkLabel = gtk_label_new("");
|
|
gtk_frame_set_label_widget(GTK_FRAME(gtkWidget), gtkLabel);
|
|
gtk_widget_show(gtkLabel);
|
|
|
|
setText(state().text);
|
|
|
|
pWidget::construct();
|
|
}
|
|
|
|
auto pFrame::destruct() -> void {
|
|
gtk_widget_destroy(gtkWidget);
|
|
}
|
|
|
|
auto pFrame::append(sSizable sizable) -> void {
|
|
if(auto sizable = _sizable()) sizable->setFont(sizable->self().font(true));
|
|
}
|
|
|
|
auto pFrame::container(mWidget& widget) -> GtkWidget* {
|
|
return gtk_widget_get_parent(gtkWidget);
|
|
}
|
|
|
|
auto pFrame::remove(sSizable sizable) -> void {
|
|
}
|
|
|
|
auto pFrame::setEnabled(bool enabled) -> void {
|
|
if(auto sizable = _sizable()) sizable->setEnabled(sizable->self().enabled(true));
|
|
pWidget::setEnabled(enabled);
|
|
}
|
|
|
|
auto pFrame::setFont(const Font& font) -> void {
|
|
if(auto sizable = _sizable()) sizable->setFont(sizable->self().font(true));
|
|
pFont::setFont(gtkLabel, font);
|
|
}
|
|
|
|
auto pFrame::setGeometry(Geometry geometry) -> void {
|
|
pWidget::setGeometry(geometry);
|
|
if(auto& sizable = state().sizable) {
|
|
Size size = pFont::size(self().font(true), state().text);
|
|
if(!state().text) size.setHeight(10);
|
|
geometry.setX(geometry.x() + 2);
|
|
geometry.setY(geometry.y() + (size.height() - 1));
|
|
geometry.setWidth(geometry.width() - 5);
|
|
geometry.setHeight(geometry.height() - (size.height() + 2));
|
|
sizable->setGeometry(geometry);
|
|
}
|
|
}
|
|
|
|
auto pFrame::setText(const string& text) -> void {
|
|
gtk_label_set_text(GTK_LABEL(gtkLabel), text);
|
|
}
|
|
|
|
auto pFrame::setVisible(bool visible) -> void {
|
|
if(auto sizable = _sizable()) sizable->setVisible(sizable->self().visible(true));
|
|
pWidget::setVisible(visible);
|
|
}
|
|
|
|
auto pFrame::_sizable() -> maybe<pSizable&> {
|
|
if(auto& sizable = state().sizable) {
|
|
if(auto self = sizable->self()) return *self;
|
|
}
|
|
return {};
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|