mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-08-19 03:51:18 +02:00
Code Issues Projects Releases Wiki Activity

Update to 20160106 OS X Preview for Developers release.

Browse Source 
byuu says:

New update. Most of the work today went into eliminating hiro::Image
from all objects in all ports, replacing with nall::image. That took an
eternity.

Changelog:
- fixed crashing bug when loading games [thanks endrift!!]
- toggling "show status bar" option adjusts window geometry (not
  supposed to recenter the window, though)
- button sizes improved; icon-only button icons no longer being cut off
This commit is contained in:
Tim Allen
2016-01-07 19:14:33 +11:00
parent 4d193d7d94
commit 0b923489dd
308 changed files with 699 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hiro/qt/widget/button.cpp
View File

@@ -8,7 +8,7 @@ auto pButton::construct() -> void {
qtButton->connect(qtButton, SIGNAL(released()), SLOT(onActivate()));
setBordered(state().bordered);
setImage(state().image);
setIcon(state().icon);
setOrientation(state().orientation);
setText(state().text);
@@ -24,13 +24,13 @@ auto pButton::minimumSize() const -> Size {
auto size = pFont::size(qtWidget->font(), state().text ? state().text : " ");
if(state().orientation == Orientation::Horizontal) {
size.setWidth(size.width() + state().image.width());
size.setHeight(max(state().image.height(), size.height()));
size.setWidth(size.width() + state().icon.width());
size.setHeight(max(size.height(), state().icon.height()));
}
if(state().orientation == Orientation::Vertical) {
size.setWidth(max(state().image.width(), size.width()));
size.setHeight(size.height() + state().image.height());
size.setWidth(max(size.width(), state().icon.width()));
size.setHeight(size.height() + state().icon.height());
}
return {size.width() + (state().text ? 20 : 12), size.height() + 12};
@@ -40,9 +40,9 @@ auto pButton::setBordered(bool bordered) -> void {
qtButton->setAutoRaise(!bordered);
}
auto pButton::setImage(const Image& image) -> void {
qtButton->setIconSize(QSize(image.width(), image.height()));
qtButton->setIcon(CreateImage(image));
auto pButton::setIcon(const image& icon) -> void {
qtButton->setIconSize(QSize(icon.width(), icon.height()));
qtButton->setIcon(CreateIcon(icon));
qtButton->setStyleSheet("text-align: top;");
}