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

Update to v098r10 release.

Browse Source 
byuu says:

Changelog:
- synchronized tomoko, loki, icarus with extensive changes to nall
  (118KiB diff)
This commit is contained in:
Tim Allen
2016-05-16 19:51:12 +10:00
parent 6ae0abe3d3
commit 3ebc77c148
105 changed files with 1281 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hiro/qt/settings.cpp
View File

@@ -13,12 +13,12 @@ Settings::Settings() {
}
auto Settings::load() -> void {
string path{configpath(), "hiro/"};
string path{Path::config(), "hiro/"};
Configuration::Document::load({path, "qt.bml"});
}
auto Settings::save() -> void {
string path{configpath(), "hiro/"};
string path{Path::config(), "hiro/"};
directory::create(path, 0755);
Configuration::Document::save({path, "qt.bml"});
}

8
hiro/qt/window.cpp
View File

@@ -8,8 +8,8 @@ auto pWindow::construct() -> void {
//if program was given a name, try and set the window taskbar icon to a matching pixmap image
if(auto name = Application::state.name) {
if(file::exists({userpath(), ".local/share/icons/", name, ".png"})) {
qtWindow->setWindowIcon(QIcon(QString::fromUtf8(string{userpath(), ".local/share/icons/", name, ".png"})));
if(file::exists({Path::user(), ".local/share/icons/", name, ".png"})) {
qtWindow->setWindowIcon(QIcon(QString::fromUtf8(string{Path::user(), ".local/share/icons/", name, ".png"})));
} else if(file::exists({"/usr/local/share/pixmaps/", name, ".png"})) {
qtWindow->setWindowIcon(QIcon(QString::fromUtf8(string{"/usr/local/share/pixmaps/", name, ".png"})));
} else if(file::exists({"/usr/share/pixmaps/", name, ".png"})) {
@@ -195,10 +195,10 @@ auto pWindow::setVisible(bool visible) -> void {
}
/*
if(widget.font().empty() && !window.state.widgetFont.empty()) {
if(!widget.font() && window.state.widgetFont) {
widget.setFont(window.state.widgetFont);
}
if(widget.font().empty()) widget.p.setFont(Font::sans(8));
if(!widget.font()) widget.p.setFont(Font::sans(8));
if(GetParentWidget(&widget)) {
widget.p.qtWidget->setParent(GetParentWidget(&widget)->p.container(widget));
} else {