mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-08-13 00:24:11 +02:00
Code Issues Projects Releases Wiki Activity

Update to v106r48 release.

Browse Source 
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)
This commit is contained in:
Tim Allen
2018-07-16 16:16:26 +10:00
parent 6090c63958
commit 393c2395bb
78 changed files with 701 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
hiro/windows/status-bar.cpp
View File

@@ -6,37 +6,49 @@ auto pStatusBar::construct() -> void {
if(auto parent = _parent()) {
hwnd = CreateWindow(STATUSCLASSNAME, L"", WS_CHILD, 0, 0, 0, 0, parent->hwnd, nullptr, GetModuleHandle(0), 0);
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)&reference);
setEnabled(self().enabled(true));
setFont(self().font(true));
setEnabled(self().enabled());
setFont(self().font());
setText(self().text());
setVisible(self().visible(true));
setVisible(self().visible());
}
}
auto pStatusBar::destruct() -> void {
if(hfont) { DeleteObject(hfont); hfont = nullptr; }
if(hwnd) { DestroyWindow(hwnd); hwnd = nullptr; }
if(auto parent = _parent()) {
parent->setGeometry(parent->state().geometry);
}
}
auto pStatusBar::setEnabled(bool enabled) -> void {
auto pStatusBar::setEnabled(bool) -> void {
//unsupported
}
auto pStatusBar::setFont(const Font& font) -> void {
auto pStatusBar::setFont(const Font&) -> void {
auto font = self().font(true);
if(hfont) DeleteObject(hfont);
hfont = pFont::create(font);
if(hwnd) SendMessage(hwnd, WM_SETFONT, (WPARAM)hfont, 0);
SendMessage(hwnd, WM_SETFONT, (WPARAM)hfont, 0);
auto& text = state().text;
auto height = font.size(text ? text : " ").height();
SendMessage(hwnd, SB_SETMINHEIGHT, (WPARAM)height, 0);
if(auto parent = _parent()) {
parent->setGeometry(parent->state().geometry);
}
}
auto pStatusBar::setText(const string& text) -> void {
if(hwnd) SendMessage(hwnd, SB_SETTEXT, 0, (LPARAM)(wchar_t*)utf16_t(text));
auto pStatusBar::setText(const string&) -> void {
auto& text = state().text;
SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM)(wchar_t*)utf16_t(text));
}
auto pStatusBar::setVisible(bool visible) -> void {
if(hwnd) ShowWindow(hwnd, visible ? SW_SHOWNORMAL : SW_HIDE);
auto pStatusBar::setVisible(bool) -> void {
ShowWindow(hwnd, self().visible() ? SW_SHOWNORMAL : SW_HIDE);
if(auto parent = _parent()) {
parent->setGeometry(parent->state().geometry);
}
@@ -46,7 +58,7 @@ auto pStatusBar::_parent() -> maybe<pWindow&> {
if(auto parent = self().parentWindow(true)) {
if(auto self = parent->self()) return *self;
}
return nothing;
return {};
}
}